Fix sdk name for OSX < 10.9 and most likely > 10.9

Add dependency for freeradius-devel to jlibtool
FreeRADIUS · Oct 24, 2013 · 14195da · 14195da
1 parent 386313a
commit 14195da
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/configure b/configure
@@ -2668,7 +2668,7 @@ fi
       if test "x$SW_VERS" = "xyes" && test "x$XCODEBUILD" = "xyes"; then
         { $as_echo "$as_me:${as_lineno-$LINENO}: determining OSX SDK path" >&5
 $as_echo "$as_me: determining OSX SDK path" >&6;}
-        osx_sdk_path=$(xcodebuild -version -sdk macosx$(sw_vers -productVersion) Path)
+        osx_sdk_path=$(xcodebuild -version -sdk macosx$(sw_vers -productVersion | egrep -o '^[0-9]+\.[0-9]+') Path)
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: $osx_sdk_path" >&5
 $as_echo "$osx_sdk_path" >&6; }
 

diff --git a/configure.ac b/configure.ac
@@ -134,7 +134,7 @@ case "$host" in
 
       if test "x$SW_VERS" = "xyes" && test "x$XCODEBUILD" = "xyes"; then
         AC_MSG_NOTICE([determining OSX SDK path])
-        osx_sdk_path=$(xcodebuild -version -sdk macosx$(sw_vers -productVersion) Path)
+        osx_sdk_path=$(xcodebuild -version -sdk macosx$(sw_vers -productVersion | egrep -o '^[[0-9]]+\.[[0-9]]+') Path)
         AC_MSG_RESULT([$osx_sdk_path])
 
         dnl #

diff --git a/scripts/libtool.mk b/scripts/libtool.mk
@@ -30,7 +30,7 @@ ifeq "${LIBTOOL}" "JLIBTOOL"
     # Note that we need to use a compilation rule that does NOT
     # include referencing ${LIBTOOL}, as we don't have a jlibtool
     # binary!
-    ${JLIBTOOL}: ${top_makedir}/jlibtool.c
+    ${JLIBTOOL}: ${top_makedir}/jlibtool.c | src/freeradius-devel
 	@mkdir -p $(dir $@)
 	@echo CC jlibtool.c
 	@${CC} $< -o $@ ${CFLAGS}
@@ -147,12 +147,12 @@ ifeq "${bm_shared_libs}" "yes"
     RELINK := local/
 
     # RPATH  : flags use to build executables that are installed,
-    #          with no dependency on the source. 
+    #          with no dependency on the source.
     # RELINL : flags use to build executables that can be run
     #          from the build directory / source tree.
     RPATH_FLAGS := -rpath ${libdir}
     RELINK_FLAGS := -rpath $(abspath ${BUILD_DIR})/lib/${RELINK}/.libs
-    
+
     RELINK_FLAGS_MIN := -rpath ${libdir}
 
     ifneq "${bm_static_libs}" "yes"