Merge pull request #2 from bonsaiviking/osx-changes

Osx changes for 0.5 release

.gitignore

@@ -28,12 +28,18 @@ nbase/Release/
 nbase/nbase.lib
 nbase/nbase.pdb
 nbase/nbase.vcxproj.user
+nbase/Makefile
+nbase/nbase_config.h
 nsock/DebugNoPcap/
 nsock/ReleaseNoPcap/
 nsock/nsock.lib
 nsock/nsock.vcxproj.user
+nsock/include/nsock_config.h
+nsock/src/Makefile
+nsock/tests/Makefile
 opensshlib/Debug/
 opensshlib/Release/
 opensshlib/openssh.vcxproj.user
 opensshlib/opensshlib.lib
-opensshlib/opensshlib.pdb
+opensshlib/opensshlib.pdb
+opensshlib/buildpkg.sh

macosx/Makefile

@@ -19,19 +19,17 @@ PACKAGEMAKER = /Developer/usr/bin/packagemaker
 
 EXTRA_DIST_FILES = $(addprefix $(IMAGE_STAGING_DIR)/,COPYING README)
 
-CONFIGURE_ARGS = --prefix="$(PREFIX)" CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)"
+CONFIGURE_ARGS = --prefix="$(PREFIX)" --without-openssl-header-check CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)"
 
 # Flags for building universal binaries. See
 # http://developer.apple.com/documentation/Porting/Conceptual/PortingUnix/compiling/chapter_4_section_3.html.
 UNIVERSAL_CONFIGURE_ARGS = --disable-dependency-tracking
-# gcc-4.0 is used to avoid an error with stdarg.h ("No such file or directory")
-# when building against the 10.4u SDK on OS X 10.6.
-UNIVERSAL_CC = gcc-4.0
-UNIVERSAL_CXX = g++-4.0
-UNIVERSAL_CPPFLAGS = -isysroot /Developer/SDKs/MacOSX10.4u.sdk
-UNIVERSAL_CFLAGS = $(UNIVERSAL_CPPFLAGS) -mmacosx-version-min=10.4 -arch ppc -arch i386
+UNIVERSAL_CC = gcc
+UNIVERSAL_CXX = g++
+UNIVERSAL_CPPFLAGS = -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk
+UNIVERSAL_CFLAGS = $(UNIVERSAL_CPPFLAGS) -mmacosx-version-min=10.9 -arch i386
 UNIVERSAL_CXXFLAGS = $(UNIVERSAL_CFLAGS)
-UNIVERSAL_LDFLAGS = -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -arch ppc -arch i386
+UNIVERSAL_LDFLAGS = -Wl,-syslibroot,/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk -mmacosx-version-min=10.9 -arch i386
 
 CC = $(UNIVERSAL_CC)
 CXX = $(UNIVERSAL_CXX)
@@ -51,8 +49,8 @@ $(IMAGE_STAGING_DIR)/$(PKG_NAME): stage-ncrack README COPYING.formatted
 
 export-%:
 	rm -rf $*
-# Using @BASE discards local changes.
-	svn export ..@BASE $*
+	mkdir $*
+	git -C .. archive master | tar -x -C $*
 
 stage-ncrack: export-$(NCRACK_BUILD_DIR)
 	cd $(NCRACK_BUILD_DIR) && ./configure $(CONFIGURE_ARGS)

modules/Makefile.in

@@ -6,6 +6,7 @@ OBJS = @MODULES_OBJS@
 
 include_dirs := .. ../nsock/include ../nbase ../opensshlib
 CPPFLAGS += $(addprefix -I,$(include_dirs)) -DHAVE_CONFIG_H
+CXXFLAGS = @CXXFLAGS@
 
 vpath %.h $(include_dirs)