Changeset 21466

Timestamp:

2010-01-15T14:18:22+13:00 (14 years ago)

Author:

mdewsnip

Message:

Updated configure script automatically generated from configure.ac.

File:

• main/trunk/gs2-core/common-src/configure (modified) (6 diffs)

main/trunk/gs2-core/common-src/configure

@@ -274 +274 @@
 PACKAGE_BUGREPORT='[email protected]'
 
-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 INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE RANLIB ac_ct_RANLIB USE_SQLITE_TRUE USE_SQLITE_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os COMPAT32BITFLAGS LIBOBJS LTLIBOBJS'
+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 INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE RANLIB ac_ct_RANLIB build build_cpu build_vendor build_os host host_cpu host_vendor host_os COMPAT32BITFLAGS USE_SQLITE_TRUE USE_SQLITE_FALSE LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
@@ -1704 +1704 @@
 
 
+# This package requires C++ compilation and library creation
 ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -2594 +2595 @@
 
 
-# Check whether --enable-sqlite or --disable-sqlite was given.
-if test "${enable_sqlite+set}" = set; then
-  enableval="$enable_sqlite"
-  USE_SQLITE=1 && cat >>confdefs.h <<\_ACEOF
-#define USE_SQLITE 1
-_ACEOF
-
-else
-  USE_SQLITE=0
-fi;
-
-cat >>confdefs.h <<_ACEOF
-#define USE_SQLITE $USE_SQLITE
-_ACEOF
-
-
-
-if test "$USE_SQLITE" = 1; then
-  USE_SQLITE_TRUE=
-  USE_SQLITE_FALSE='#'
-else
-  USE_SQLITE_TRUE='#'
-  USE_SQLITE_FALSE=
-fi
-
-
+# Check for 64-bit machines
 # Make sure we can run config.sub.
 $ac_config_sub sun4 >/dev/null 2>&1 ||
@@ -2692 +2668 @@
 
 
+# Option: SQLite support
+# Check whether --enable-sqlite or --disable-sqlite was given.
+if test "${enable_sqlite+set}" = set; then
+  enableval="$enable_sqlite"
+  USE_SQLITE=1 && cat >>confdefs.h <<\_ACEOF
+#define USE_SQLITE 1
+_ACEOF
+
+else
+  USE_SQLITE=0
+fi;
+
+cat >>confdefs.h <<_ACEOF
+#define USE_SQLITE $USE_SQLITE
+_ACEOF
+
+
+
+if test "$USE_SQLITE" = 1; then
+  USE_SQLITE_TRUE=
+  USE_SQLITE_FALSE='#'
+else
+  USE_SQLITE_TRUE='#'
+  USE_SQLITE_FALSE=
+fi
+
+
+# Generate the Makefiles for this package
                     ac_config_files="$ac_config_files Makefile src/lib/Makefile"
 cat >confcache <<\_ACEOF
@@ -3378 +3382 @@
 s,@RANLIB@,$RANLIB,;t t
 s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
-s,@USE_SQLITE_TRUE@,$USE_SQLITE_TRUE,;t t
-s,@USE_SQLITE_FALSE@,$USE_SQLITE_FALSE,;t t
 s,@build@,$build,;t t
 s,@build_cpu@,$build_cpu,;t t
@@ -3389 +3391 @@
 s,@host_os@,$host_os,;t t
 s,@COMPAT32BITFLAGS@,$COMPAT32BITFLAGS,;t t
+s,@USE_SQLITE_TRUE@,$USE_SQLITE_TRUE,;t t
+s,@USE_SQLITE_FALSE@,$USE_SQLITE_FALSE,;t t
 s,@LIBOBJS@,$LIBOBJS,;t t
 s,@LTLIBOBJS@,$LTLIBOBJS,;t t