[Radmind-commit] radmind aclocal.m4, 1.18, 1.19 configure.ac, 1.42, 1.43 configure, 1.53, 1.54

[Andrew M. <fit...@us...>]

Update of /cvsroot/radmind/radmind
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23131

Modified Files:
	aclocal.m4 configure.ac configure 
Log Message:
Reorganized universal binary setup. (Mac OS X)
Set MACOSX_DEPLOYMENT_TARGET to 10.4 so builds on 10.5 work on 10.4. (Mac OS X)
Fixed complaint from configure script resulting from unquoted variable. (common)


Index: aclocal.m4
===================================================================
RCS file: /cvsroot/radmind/radmind/aclocal.m4,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** aclocal.m4	17 Jan 2008 04:08:26 -0000	1.18
--- aclocal.m4	18 Jan 2008 18:46:18 -0000	1.19
***************
*** 123,127 ****
          ,[enable_universal_binaries=no])
      if test "${enable_universal_binaries}" = "yes"; then
-         AC_CANONICAL_SYSTEM
          case "${host_os}" in
  	  darwin8*)
--- 123,126 ----
***************
*** 130,150 ****
  
  	  darwin9*)
  	    macosx_sdk="MacOSX10.5.sdk"
  	    ;;
  
  	  *)
  	    ;;
  	esac
  
! 	case "${host_os}" in
!           darwin*)
!             echo ===========================================================
!             echo Setting up universal binaries for ${host_os}
!             echo ===========================================================
!             OPTOPTS="$OPTOPTS -isysroot /Developer/SDKs/$macosx_sdk -arch i386 -arch ppc"
!             ;;
!           *)
!             AC_MSG_ERROR([Building universal binaries on ${host_os} is not supported])
!           esac
      fi
  ])
--- 129,145 ----
  
  	  darwin9*)
+ 	    export MACOSX_DEPLOYMENT_TARGET="10.4"
  	    macosx_sdk="MacOSX10.5.sdk"
  	    ;;
  
  	  *)
+             AC_MSG_ERROR([Building universal binaries on ${host_os} is not supported])
  	    ;;
  	esac
  
! 	echo ===========================================================
! 	echo Setting up universal binaries for ${host_os}
! 	echo ===========================================================
! 	OPTOPTS="$OPTOPTS -isysroot /Developer/SDKs/$macosx_sdk -arch i386 -arch ppc"
      fi
  ])

Index: configure.ac
===================================================================
RCS file: /cvsroot/radmind/radmind/configure.ac,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** configure.ac	18 Jun 2007 19:40:05 -0000	1.42
--- configure.ac	18 Jan 2008 18:46:18 -0000	1.43
***************
*** 32,36 ****
  #AC_SUBST(certdir) 
  
! CHECK_UNIVERSAL_BINARIES
  
  # Checks for programs.
--- 32,36 ----
  #AC_SUBST(certdir) 
  
! AC_CANONICAL_SYSTEM
  
  # Checks for programs.
***************
*** 72,75 ****
--- 72,76 ----
  
  CHECK_ZLIB
+ CHECK_UNIVERSAL_BINARIES
  
  # HPUX lacks wait4 and strtoll
***************
*** 77,81 ****
  
  # Miscellaneous:
! if test x_$OPTOPTS = x_; then
      if test x_$GCC = x_yes; then
          OPTOPTS="$OPTOPTS -Wall -Wmissing-prototypes"
--- 78,82 ----
  
  # Miscellaneous:
! if test x_"$OPTOPTS" = x_; then
      if test x_$GCC = x_yes; then
          OPTOPTS="$OPTOPTS -Wall -Wmissing-prototypes"

Index: configure
===================================================================
RCS file: /cvsroot/radmind/radmind/configure,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** configure	17 Jan 2008 04:09:51 -0000	1.53
--- configure	18 Jan 2008 18:46:18 -0000	1.54
***************
*** 1281,1287 ****
    --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
    --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
    --enable-universal-binaries
                            build universal binaries (default=no)
-   --disable-largefile     omit support for large files
  
  Optional Packages:
--- 1281,1287 ----
    --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
    --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+   --disable-largefile     omit support for large files
    --enable-universal-binaries
                            build universal binaries (default=no)
  
  Optional Packages:
***************
*** 1924,1937 ****
  
  
! 
!     # Check whether --enable-universal_binaries was given.
! if test "${enable_universal_binaries+set}" = set; then
!   enableval=$enable_universal_binaries;
! else
!   enable_universal_binaries=no
! fi
! 
!     if test "${enable_universal_binaries}" = "yes"; then
!         { echo "$as_me:$LINENO: checking target system type" >&5
  echo $ECHO_N "checking target system type... $ECHO_C" >&6; }
  if test "${ac_cv_target+set}" = set; then
--- 1924,1928 ----
  
  
! { echo "$as_me:$LINENO: checking target system type" >&5
  echo $ECHO_N "checking target system type... $ECHO_C" >&6; }
  if test "${ac_cv_target+set}" = set; then
***************
*** 1976,2006 ****
      NONENONEs,x,x, &&
    program_prefix=${target_alias}-
-         case "${host_os}" in
- 	  darwin8*)
- 	    macosx_sdk="MacOSX10.4u.sdk"
- 	    ;;
- 
- 	  darwin9*)
- 	    macosx_sdk="MacOSX10.5.sdk"
- 	    ;;
- 
- 	  *)
- 	    ;;
- 	esac
- 
- 	case "${host_os}" in
-           darwin*)
-             echo ===========================================================
-             echo Setting up universal binaries for ${host_os}
-             echo ===========================================================
-             OPTOPTS="$OPTOPTS -isysroot /Developer/SDKs/$macosx_sdk -arch i386 -arch ppc"
-             ;;
-           *)
-             { { echo "$as_me:$LINENO: error: Building universal binaries on ${host_os} is not supported" >&5
- echo "$as_me: error: Building universal binaries on ${host_os} is not supported" >&2;}
-    { (exit 1); exit 1; }; }
-           esac
-     fi
- 
  
  # Checks for programs.
--- 1967,1970 ----
***************
*** 5971,5974 ****
--- 5935,5970 ----
  
  
+     # Check whether --enable-universal_binaries was given.
+ if test "${enable_universal_binaries+set}" = set; then
+   enableval=$enable_universal_binaries;
+ else
+   enable_universal_binaries=no
+ fi
+ 
+     if test "${enable_universal_binaries}" = "yes"; then
+         case "${host_os}" in
+ 	  darwin8*)
+ 	    macosx_sdk="MacOSX10.4u.sdk"
+ 	    ;;
+ 
+ 	  darwin9*)
+ 	    export MACOSX_DEPLOYMENT_TARGET="10.4"
+ 	    macosx_sdk="MacOSX10.5.sdk"
+ 	    ;;
+ 
+ 	  *)
+             { { echo "$as_me:$LINENO: error: Building universal binaries on ${host_os} is not supported" >&5
+ echo "$as_me: error: Building universal binaries on ${host_os} is not supported" >&2;}
+    { (exit 1); exit 1; }; }
+ 	    ;;
+ 	esac
+ 
+ 	echo ===========================================================
+ 	echo Setting up universal binaries for ${host_os}
+ 	echo ===========================================================
+ 	OPTOPTS="$OPTOPTS -isysroot /Developer/SDKs/$macosx_sdk -arch i386 -arch ppc"
+     fi
+ 
+ 
  # HPUX lacks wait4 and strtoll
  
***************
*** 6069,6073 ****
  
  # Miscellaneous:
! if test x_$OPTOPTS = x_; then
      if test x_$GCC = x_yes; then
          OPTOPTS="$OPTOPTS -Wall -Wmissing-prototypes"
--- 6065,6069 ----
  
  # Miscellaneous:
! if test x_"$OPTOPTS" = x_; then
      if test x_$GCC = x_yes; then
          OPTOPTS="$OPTOPTS -Wall -Wmissing-prototypes"