Thread: [Libsnet-commit] libsnet aclocal.m4,1.9,1.10 configure,1.16,1.17 configure.ac,1.8,1.9

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/libsnet/libsnet
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv13358

Modified Files:
	aclocal.m4 configure configure.ac 
Log Message:
Added --enable-universal-binaries.

Index: aclocal.m4
===================================================================
RCS file: /cvsroot/libsnet/libsnet/aclocal.m4,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** aclocal.m4	13 Jan 2006 20:47:23 -0000	1.9
--- aclocal.m4	23 May 2006 16:01:49 -0000	1.10
***************
*** 160,161 ****
--- 160,181 ----
      fi
  ])
+ 
+ AC_DEFUN([CHECK_UNIVERSAL_BINARIES],
+ [
+     AC_ARG_ENABLE(universal_binaries,
+ 	AC_HELP_STRING([--enable-universal_binaries], [build universal binaries (default=no)]),
+ 	,[enable_universal_binaries=no])
+     if test "${enable_universal_binaries}" = "yes"; then
+ 	AC_CANONICAL_SYSTEM
+ 	case "${host_os}" in
+ 	  darwin*)
+ 	    echo ===========================================================
+ 	    echo Setting up universal binaries for ${host_os}
+ 	    echo ===========================================================
+ 	    OPTOPTS="$OPTOPTS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc"
+ 	    ;;
+ 	  *)
+ 	    AC_MSG_ERROR([Building universal binaries on ${host_os} is not supported])
+ 	  esac
+     fi
+ ])

Index: configure.ac
===================================================================
RCS file: /cvsroot/libsnet/libsnet/configure.ac,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** configure.ac	13 Jan 2006 20:47:23 -0000	1.8
--- configure.ac	23 May 2006 16:01:49 -0000	1.9
***************
*** 19,22 ****
--- 19,23 ----
  fi
  CHECK_SASL
+ CHECK_UNIVERSAL_BINARIES

  # Checks for header files.

Index: configure
===================================================================
RCS file: /cvsroot/libsnet/libsnet/configure,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** configure	13 Jan 2006 20:47:23 -0000	1.16
--- configure	23 May 2006 16:01:49 -0000	1.17
***************
*** 436,440 ****

  ac_unique_file="snet.c"
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS AWK CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PROFILED build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP LIBTOOL OPTOPTS LIBOBJS LTLIBOBJS'
  ac_subst_files=''

--- 436,440 ----

  ac_unique_file="snet.c"
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS AWK CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os PROFILED LN_S ECHO RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP LIBTOOL OPTOPTS LIBOBJS LTLIBOBJS'
  ac_subst_files=''

***************
*** 957,960 ****
--- 957,961 ----
    --build=BUILD     configure for building on BUILD [guessed]
    --host=HOST       cross-compile to build programs to run on HOST [BUILD]
+   --target=TARGET   configure for building compilers for TARGET [HOST]
  _ACEOF
  fi
***************
*** 969,972 ****
--- 970,975 ----
    --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)
    --enable-profiled       build profiled libsnet (default=yes)
    --enable-shared=PKGS  build shared libraries default=no
***************
*** 2844,2847 ****
--- 2847,2955 ----
      fi

+ # Make sure we can run config.sub.
+ $ac_config_sub sun4 >/dev/null 2>&1 ||
+   { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
+ echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ echo "$as_me:$LINENO: checking build system type" >&5
+ echo $ECHO_N "checking build system type... $ECHO_C" >&6
+ if test "${ac_cv_build+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_build_alias=$build_alias
+ test -z "$ac_cv_build_alias" &&
+   ac_cv_build_alias=`$ac_config_guess`
+ test -z "$ac_cv_build_alias" &&
+   { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+ echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+    { (exit 1); exit 1; }; }
+ ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
+   { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
+ echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+ echo "${ECHO_T}$ac_cv_build" >&6
+ build=$ac_cv_build
+ build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+ build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+ build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+ 
+ 
+ echo "$as_me:$LINENO: checking host system type" >&5
+ echo $ECHO_N "checking host system type... $ECHO_C" >&6
+ if test "${ac_cv_host+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_host_alias=$host_alias
+ test -z "$ac_cv_host_alias" &&
+   ac_cv_host_alias=$ac_cv_build_alias
+ ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
+   { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+ echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+ echo "${ECHO_T}$ac_cv_host" >&6
+ host=$ac_cv_host
+ host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+ host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+ host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+ 
+ 
+ 
+     # Check whether --enable-universal_binaries or --disable-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
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_target_alias=$target_alias
+ test "x$ac_cv_target_alias" = "x" &&
+   ac_cv_target_alias=$ac_cv_host_alias
+ ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
+   { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5
+ echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_target" >&5
+ echo "${ECHO_T}$ac_cv_target" >&6
+ target=$ac_cv_target
+ target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+ target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+ target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+ 
+ 
+ # The aliases save the names the user supplied, while $host etc.
+ # will get canonicalized.
+ test -n "$target_alias" &&
+   test "$program_prefix$program_suffix$program_transform_name" = \
+     NONENONEs,x,x, &&
+   program_prefix=${target_alias}-
+ 	case "${host_os}" in
+ 	  darwin*)
+ 	    echo ===========================================================
+ 	    echo Setting up universal binaries for ${host_os}
+ 	    echo ===========================================================
+ 	    OPTOPTS="$OPTOPTS -isysroot /Developer/SDKs/MacOSX10.4u.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 header files.
***************
*** 2944,3001 ****
    enable_fast_install=yes
  fi;
- # Make sure we can run config.sub.
- $ac_config_sub sun4 >/dev/null 2>&1 ||
-   { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
- echo "$as_me: error: cannot run $ac_config_sub" >&2;}
-    { (exit 1); exit 1; }; }
- 
- echo "$as_me:$LINENO: checking build system type" >&5
- echo $ECHO_N "checking build system type... $ECHO_C" >&6
- if test "${ac_cv_build+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_cv_build_alias=$build_alias
- test -z "$ac_cv_build_alias" &&
-   ac_cv_build_alias=`$ac_config_guess`
- test -z "$ac_cv_build_alias" &&
-   { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
- echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-    { (exit 1); exit 1; }; }
- ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-   { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
- echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
-    { (exit 1); exit 1; }; }
- 
- fi
- echo "$as_me:$LINENO: result: $ac_cv_build" >&5
- echo "${ECHO_T}$ac_cv_build" >&6
- build=$ac_cv_build
- build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
- build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
- build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
- 
- 
- echo "$as_me:$LINENO: checking host system type" >&5
- echo $ECHO_N "checking host system type... $ECHO_C" >&6
- if test "${ac_cv_host+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_cv_host_alias=$host_alias
- test -z "$ac_cv_host_alias" &&
-   ac_cv_host_alias=$ac_cv_build_alias
- ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-   { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
- echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
-    { (exit 1); exit 1; }; }
- 
- fi
- echo "$as_me:$LINENO: result: $ac_cv_host" >&5
- echo "${ECHO_T}$ac_cv_host" >&6
- host=$ac_cv_host
- host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
- host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
- host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
- 
- 
  # Find the correct PATH separator.  Usually this is `:', but
  # DJGPP uses `;' like DOS.
--- 3052,3055 ----
***************
*** 4030,4034 ****
  *-*-irix6*)
    # Find out which ABI we are using.
!   echo '#line 4032 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
--- 4084,4088 ----
  *-*-irix6*)
    # Find out which ABI we are using.
!   echo '#line 4086 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
***************
*** 4602,4606 ****
  CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
  compiler_c_o=no
! if { (eval echo configure:4604: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
    # The compiler can only warn and ignore the option if not recognized
    # So say no if there are warnings
--- 4656,4660 ----
  CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
  compiler_c_o=no
! if { (eval echo configure:4658: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
    # The compiler can only warn and ignore the option if not recognized
    # So say no if there are warnings
***************
*** 6566,6570 ****
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
! #line 6568 "configure"
  #include "confdefs.h"

--- 6620,6624 ----
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
! #line 6622 "configure"
  #include "confdefs.h"

***************
*** 6664,6668 ****
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
! #line 6666 "configure"
  #include "confdefs.h"

--- 6718,6722 ----
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
! #line 6720 "configure"
  #include "confdefs.h"

***************
*** 8031,8035 ****
  s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
  s,@INSTALL_DATA@,$INSTALL_DATA,;t t
- s,@PROFILED@,$PROFILED,;t t
  s,@build@,$build,;t t
  s,@build_cpu@,$build_cpu,;t t
--- 8085,8088 ----
***************
*** 8040,8043 ****
--- 8093,8101 ----
  s,@host_vendor@,$host_vendor,;t t
  s,@host_os@,$host_os,;t t
+ s,@target@,$target,;t t
+ s,@target_cpu@,$target_cpu,;t t
+ s,@target_vendor@,$target_vendor,;t t
+ s,@target_os@,$target_os,;t t
+ s,@PROFILED@,$PROFILED,;t t
  s,@LN_S@,$LN_S,;t t
  s,@ECHO@,$ECHO,;t t

Thread: [Libsnet-commit] libsnet aclocal.m4,1.9,1.10 configure,1.16,1.17 configure.ac,1.8,1.9

libsnet-commit