* configure.ac: Standardize order of flags and libs

Check for proper defs in tzfile.h. Add sub-configure options
so they are listed in help. Add generic include/lib flags option.
* config.mak.in: Add load flags variable
* base.make.in: Idem.
* SSL/configure.ac: Add generic include/lib flags option.

* Version: Add numeric value for runtime versioning.
* Souce/GNUmakeifle: Add resource set install
* Source/Makefile.postamble (Info-gnustep.plist): New target.
* Testing/nsbundle.m: Additional tests.

* Source/NSTimeZone.m: Check for proper tzfile defs (Fixes #10724).


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@20261 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -1,3 +1,19 @@
+2004-10-26  Adam Fedor  <fedor@gnu.org>
+
+	* configure.ac: Standardize order of flags and libs
+	Check for proper defs in tzfile.h. Add sub-configure options
+	so they are listed in help. Add generic include/lib flags option.
+	* config.mak.in: Add load flags variable
+	* base.make.in: Idem.
+	* SSL/configure.ac: Add generic include/lib flags option.
+
+	* Version: Add numeric value for runtime versioning.
+	* Souce/GNUmakeifle: Add resource set install
+	* Source/Makefile.postamble (Info-gnustep.plist): New target.
+	* Testing/nsbundle.m: Additional tests.
+
+	* Source/NSTimeZone.m: Check for proper tzfile defs (Fixes #10724).
+
 2004-10-24 Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/NSDistributedNotificationCenter.m: Changed to explicitly

Documentation/HtmlNav/docs-web.html

@@ -159,13 +159,13 @@
 	  <a href="../information/machines_toc.html">Platforms</a><br />
 	  <a href="../resources/sources.html">Download</a><br />
 	  <a href="../experience/apps.html">Applications</a><br />
-	  <a href="../documentation/User/GNUstep/userfaq_toc.html">User FAQ</a><br />
+	  <a href="../resources/documentation/User/GNUstep/userfaq_toc.html">User FAQ</a><br />
+	  <a href="../experience/documentation.html">Getting Started</a><br />
 	<br />
 	<b>Developers</b><br />
-	  <a href="../experience/documentation.html">Getting Started</a><br />
 	  <a href="../resources/docs-web.html">Documentation</a><br />
 	  <a href="http://wiki.gnustep.org/">Wiki Docs</a><br />
-	  <a href="../documentation/User/GNUstep/faq_toc.html">Developer FAQ</a><br />
+	  <a href="../resources/documentation/User/GNUstep/faq_toc.html">Developer FAQ</a><br />
 	  <a href="../developers/map.html">Libraries</a><br />
 	  <a href="../developers/whoiswho.html">Who's Who</a>?<br />
 	 <br />

Headers/Additions/GNUstepBase/config.h.in

@@ -306,6 +306,9 @@
 /* Define to 1 if you have the <tzfile.h> header file. */
 #undef HAVE_TZFILE_H
 
+/* Define if tzfile.h includes the proper definitions */
+#undef HAVE_TZHEAD
+
 /* Define to 1 if you have the `tzset' function. */
 #undef HAVE_TZSET
 

SSL/configure.ac

@@ -84,6 +84,25 @@ esac
 
 AC_CHECK_HEADERS(libc.h limits.h malloc.h memory.h string.h signal.h sys/signal.h sys/param.h sys/wait.h sys/file.h sys/fcntl.h sys/ioctl.h sys/stropts.h unistd.h utime.h stdint.h sys/inttypes.h)
 
+#--------------------------------------------------------------------
+# Simple way to add a bunch of paths to the flags
+#--------------------------------------------------------------------
+AC_ARG_WITH(include-flags,
+    [  --with-include-flags=FLAGS specify all include flags at once],
+    include_flags="$withval", include_flags="no")
+if test ${include_flags} != "no"; then
+    CPPFLAGS="${include_flags} $CPPFLAGS"
+    SSLFLAGS="${include_flags}"
+fi
+
+AC_ARG_WITH(library-flags,
+    [  --with-library-flags=FLAGS specify all library flags at once],
+    library_flags="$withval", library_flags="no")
+if test ${library_flags} != "no"; then
+    LIBS="${library_flags} $LIBS"
+    SSLLIBS="${library_flags}"
+fi
+
 #--------------------------------------------------------------------
 # Check OpenSSL for HTTPS support.
 #--------------------------------------------------------------------

Source/GNUmakefile

@@ -368,11 +368,21 @@ libgnustep-base_HEADER_FILES_INSTALL_DIR = /Foundation
 
 libgnustep-base_HEADER_FILES = $(FOUNDATION_HEADERS)
 
+# Resources
+RESOURCE_SET_NAME = libbase-resources
+libbase-resources_RESOURCE_FILES_INSTALL_DIR = Library/Libraries/Resources/gnustep-base
+libbase-resources_LANGUAGES =
+libbase-resources_LOCALIZED_RESOURCE_FILES =
+libbase-resources_RESOURCE_DIRS =
+libbase-resources_RESOURCE_FILES = Info-gnustep.plist
+
+
 -include Makefile.preamble
 
 -include GNUmakefile.local
 
 include $(GNUSTEP_MAKEFILES)/library.make
+include $(GNUSTEP_MAKEFILES)/resource-set.make
 
 -include Makefile.postamble
 

Source/Makefile.postamble

@@ -39,7 +39,7 @@
 before-all::  $(GENERATED_HFILES)
 
 # Things to do after compiling
-# after-all::
+after-all:: Info-gnustep.plist
 
 # Things to do before installing
 # before-install::
@@ -171,3 +171,14 @@ libgnustep-base.def: $(OBJ_FILES_TO_LINK)
 	cat _tmp.def | grep "_class_name_" >> $@
 	rm -rf _tmp.def
 
+#
+# Make an Info.plist since libraries don't have these normally
+#
+Info-gnustep.plist:
+	$(ECHO_CREATING)(echo "{"; \
+	echo "  NSExecutable = \"gnustep-base\";"; \
+	echo "  NSPrincipalClass = \"NSObject\";"; \
+	echo "  GSBundleShortVersionString = \"$(VERSION)\";"; \
+	echo "  GSBundleVersion = $(VERSION_NUMBER);"; \
+	echo "}") > $@$(END_ECHO)
+

Source/NSTimeZone.m

@@ -108,7 +108,7 @@
 #include "GNUstepBase/GSCategories.h"
 #include "GSConfig.h"
 
-#ifdef HAVE_TZFILE_H
+#ifdef HAVE_TZHEAD
 #include <tzfile.h>
 #else
 #define NOID
@@ -1226,7 +1226,7 @@ static NSMapTable	*absolutes = 0;
           /* Get the zone name from the localtime file, assuming the file
 	     is a symlink to the time zone. Getting the actual data (which
 	     is easier) doesn't help, since we won't know the name itself.  */
-#if defined(HAVE_TZFILE_H) && defined(TZDEFAULT)
+#if defined(HAVE_TZHEAD) && defined(TZDEFAULT)
 	  tzdir = RETAIN([NSString stringWithCString: TZDIR]);
 	  localZoneString = [NSString stringWithCString: TZDEFAULT];
 	  localZoneString = [localZoneString stringByResolvingSymlinksInPath];

Testing/nsbundle.m

@@ -34,7 +34,15 @@ main(int argc, char *argv[], char **env)
     arp = [NSAutoreleasePool new];
     
     setbuf(stdout, 0);
-    printf("  GNUstep bundle directory is %s\n", [[[NSBundle gnustepBundle] bundlePath] cString]);
+    /* Test bundle version and info files */
+    bundle = [NSBundle bundleForLibrary: @"gnustep-base"];
+    GSPrintf(stdout, @"  GNUstep Base Resources: %@\n", [bundle bundlePath]);
+    object = [bundle infoDictionary];
+    GSPrintf(stdout, @"  gnustep-base version string = %@\n",
+    	     [object objectForKey: @"GSBundleShortVersionString"]);
+    GSPrintf(stdout, @"  gnustep-base version number = %g\n\n",
+    	     [[object objectForKey: @"GSBundleVersion"] doubleValue]);
+
 
     path = [[[NSProcessInfo processInfo] arguments] objectAtIndex: 0];
     printf("  Executable is in %s\n", [path cString]);
@@ -119,6 +127,8 @@ main(int argc, char *argv[], char **env)
 	[object printMyName];
 	[object release];
       }
+
+
     [arp release];
     return 0;
 }

Version

@@ -8,6 +8,8 @@ GCC_VERSION=2.8.0
 MAJOR_VERSION=1
 MINOR_VERSION=10
 SUBMINOR_VERSION=0
+# numeric value should match above
+VERSION_NUMBER=110.0
 GNUSTEP_BASE_VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${SUBMINOR_VERSION}
 VERSION=${GNUSTEP_BASE_VERSION}
 

base.make.in

@@ -30,6 +30,7 @@ ifeq ($(FOUNDATION_LIB),gnu)
   AUXILIARY_OBJCFLAGS += @NX_CONST_STRING_OBJCFLAGS@
   ifeq ($(shared),no)
     CONFIG_SYSTEM_LIBS += @LIBS@
+    CONFIG_SYSTEM_LIB_DIR += @LDIR_FLAGS@
   endif
 
   GNUSTEP_BASE_VERSION = @VERSION@

config.mak.in

@@ -17,6 +17,7 @@ HAVE_PTHREAD_H=@HAVE_PTHREAD_H@
 CONFIG_SYSTEM_INCL += @INCLUDE_FLAGS@
 ifeq ($(shared),yes)
   CONFIG_SYSTEM_LIBS += @LIBS@
+  CONFIG_SYSTEM_LIB_DIR += @LDIR_FLAGS@
 endif
 
 GNUSTEP_BASE_HAVE_LIBXML=@HAVE_LIBXML@

configure

@@ -310,7 +310,7 @@ ac_includes_default="\
 #endif"
 
 ac_subdirs_all="$ac_subdirs_all Source/mframe SSL"
-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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP WHOAMI EGREP GS_WORDS_BIGENDIAN GS_SINT8 GS_UINT8 ac_cv_sizeof_short ac_cv_sizeof_int ac_cv_sizeof_long ac_cv_sizeof_long_long ac_cv_sizeof_float ac_cv_sizeof_double ac_cv_sizeof_voidp GS_ADDR GS_SINT16 GS_UINT16 GS_SINT32 GS_UINT32 GS_SINT64 GS_UINT64 GS_HAVE_I64 GS_SINT128 GS_UINT128 GS_HAVE_I128 GS_FLT32 GS_FLT64 _GSC_S_SHT _GSC_S_INT _GSC_S_LNG _GSC_S_LNG_LNG DYNAMIC_LINKER NX_CONST_STRING_OBJCFLAGS NX_CONST_STRING_CLASS HAVE_PTHREAD_H HAVE_PTS_STREAM_MODULES INCLUDE_STDINT DEFINE_UINT8_T DEFINE_INT32_T DEFINE_INT64_T USE_ZLIB GS_PASS_ARGUMENTS GS_FAKE_MAIN WITH_FFI XML2_CONFIG XML_CONFIG XML_CFLAGS XML_LIBS HAVE_LIBXSLT HAVE_LIBXML USE_GMP INCLUDE_FLAGS subdirs VERSION MAJOR_VERSION MINOR_VERSION SUBMINOR_VERSION GCC_VERSION 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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP WHOAMI EGREP GS_WORDS_BIGENDIAN GS_SINT8 GS_UINT8 ac_cv_sizeof_short ac_cv_sizeof_int ac_cv_sizeof_long ac_cv_sizeof_long_long ac_cv_sizeof_float ac_cv_sizeof_double ac_cv_sizeof_voidp GS_ADDR GS_SINT16 GS_UINT16 GS_SINT32 GS_UINT32 GS_SINT64 GS_UINT64 GS_HAVE_I64 GS_SINT128 GS_UINT128 GS_HAVE_I128 GS_FLT32 GS_FLT64 _GSC_S_SHT _GSC_S_INT _GSC_S_LNG _GSC_S_LNG_LNG DYNAMIC_LINKER NX_CONST_STRING_OBJCFLAGS NX_CONST_STRING_CLASS HAVE_PTHREAD_H HAVE_PTS_STREAM_MODULES INCLUDE_STDINT DEFINE_UINT8_T DEFINE_INT32_T DEFINE_INT64_T USE_ZLIB GS_PASS_ARGUMENTS GS_FAKE_MAIN WITH_FFI XML2_CONFIG XML_CONFIG XML_CFLAGS XML_LIBS HAVE_LIBXSLT HAVE_LIBXML USE_GMP INCLUDE_FLAGS LDIR_FLAGS subdirs VERSION MAJOR_VERSION MINOR_VERSION SUBMINOR_VERSION GCC_VERSION LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -855,16 +855,21 @@ Optional Features:
   --disable-xml			Compile even if XML-dependencies are not met
   --disable-xmltest		Do not try to compile and run a test XML program
   --disable-xslt		Compile even if XSLT-dependency is not met
+  --disable-openssl		Disable support for openssl in URL classes
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-include-flags=FLAGS specify all include flags at once
+  --with-library-flags=FLAGS specify all library flags at once
   --with-ffi-include=PATH include path for ffi (ffcall/libffi) headers
   --with-ffi-library=PATH library path for ffi (ffcall/libffi) libraries
   --with-xml-prefix=PFX    Prefix where libxml is installed (optional)
   --with-gmp-include=PATH  include path for gmp headers
   --with-gmp-library=PATH  library path for gmp libraries
   --with-libiconv-library=PATH  library path for libiconv libraries
+  --with-openssl-include=PATH  include path for openssl headers
+  --with-openssl-library=PATH  library path for openssl libraries
 
 Some influential environment variables:
   CC          C compiler command
@@ -2656,7 +2661,7 @@ fi
 # specific target_os options
 #--------------------------------------------------------------------
 INCLUDE_FLAGS="$CPPFLAGS"
-LIBS="$LDFLAGS $LIBS"
+LDIR_FLAGS="$LDFLAGS"
 # This is just for configuring. Later, in config.make, INCLUDE_FLAGS
 # goes in CONFIG_SYSTEM_INCL and LIBS goes in CONFIG_SYSTEM_LIBS
 case "$target_os" in
@@ -9327,6 +9332,29 @@ fi
 done
 
 
+# Check if tzfile contains the proper definitions
+if test $ac_cv_header_tzfile_h = yes; then
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <tzfile.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "tzhead" >/dev/null 2>&1; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_TZHEAD 1
+_ACEOF
+
+fi
+rm -f conftest*
+
+fi
+
 #--------------------------------------------------------------------
 # These headers/functions needed by GSTcpPort.m
 #--------------------------------------------------------------------
@@ -13411,6 +13439,35 @@ esac
 echo "$as_me:$LINENO: result: $enable_fake_main" >&5
 echo "${ECHO_T}$enable_fake_main" >&6
 
+#--------------------------------------------------------------------
+# Simple way to add a bunch of paths to the flags
+#--------------------------------------------------------------------
+
+# Check whether --with-include-flags or --without-include-flags was given.
+if test "${with_include_flags+set}" = set; then
+  withval="$with_include_flags"
+  include_flags="$withval"
+else
+  include_flags="no"
+fi;
+if test ${include_flags} != "no"; then
+    CPPFLAGS="$CPPFLAGS ${include_flags}"
+    INCLUDE_FLAGS="$INCLUDE_FLAGS ${include_flags}"
+fi
+
+
+# Check whether --with-library-flags or --without-library-flags was given.
+if test "${with_library_flags+set}" = set; then
+  withval="$with_library_flags"
+  library_flags="$withval"
+else
+  library_flags="no"
+fi;
+if test ${library_flags} != "no"; then
+    LDFLAGS="$LDFLAGS ${library_flags}"
+    LDIR_FLAGS="$LDIR_FLAGS ${library_flags}"
+fi
+
 #--------------------------------------------------------------------
 # Check for FFI interface libraries for invocations
 # We enable ffcall by default now.
@@ -13459,8 +13516,8 @@ else
   ffi_incdir="no"
 fi;
 if test ${ffi_incdir} != "no"; then
-    CPPFLAGS="-I${ffi_incdir} $CPPFLAGS"
+    CPPFLAGS="$CPPFLAGS -I${ffi_incdir}"
-    INCLUDE_FLAGS="-I${ffi_incdir} $INCLUDE_FLAGS"
+    INCLUDE_FLAGS="$INCLUDE_FLAGS -I${ffi_incdir}"
 fi
 
 
@@ -13472,7 +13529,8 @@ else
   ffi_libdir="no"
 fi;
 if test ${ffi_libdir} != "no"; then
-    LIBS="-L${ffi_libdir} $LIBS"
+    LDFLAGS="$LDFLAGS -L${ffi_libdir}"
+    LDIR_FLAGS="$LDIR_FLAGS -L${ffi_libdir}"
 fi
 
 if test "${ac_cv_header_ffi_h+set}" = set; then
@@ -13819,7 +13877,7 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
   WITH_FFI=libffi
-  LIBS="$LIBS -lffi"
+  LIBS="-lffi $LIBS"
   echo "$as_me:$LINENO: result: libffi" >&5
 echo "${ECHO_T}libffi" >&6
 elif test $enable_ffcall = yes; then
@@ -13829,7 +13887,7 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
   WITH_FFI=ffcall
-  LIBS="$LIBS -lcallback -lavcall"
+  LIBS="-lcallback -lavcall $LIBS"
   echo "$as_me:$LINENO: result: ffcall" >&5
 echo "${ECHO_T}ffcall" >&6
 else
@@ -14155,7 +14213,7 @@ echo "${ECHO_T}no" >&6
   if test $enable_libxml = yes; then
     CPPFLAGS="$CPPFLAGS $XML_CFLAGS"
     INCLUDE_FLAGS="$INCLUDE_FLAGS $XML_CFLAGS"
-    LIBS="$LIBS $XML_LIBS"
+    LIBS="$XML_LIBS $LIBS"
     HAVE_LIBXML=1
 
 cat >>confdefs.h <<\_ACEOF
@@ -14550,7 +14608,7 @@ cat >>confdefs.h <<\_ACEOF
 #define HAVE_LIBXSLT 1
 _ACEOF
 
-	LIBS="$LIBS -lxslt"
+	LIBS="-lxslt $LIBS"
       else
 	echo
 	echo "You most likely do not want to build base without XSLT support."
@@ -14608,7 +14666,6 @@ else
   gmp_libdir="no"
 fi;
 
-cppflags_temp="$CPPFLAGS"
 libs_temp=$LIBS
 
 if test "$gmp_incdir" != "no"; then
@@ -14616,7 +14673,8 @@ if test "$gmp_incdir" != "no"; then
   INCLUDE_FLAGS="$INCLUDE_FLAGS -I$gmp_incdir"
 fi
 if test "$gmp_libdir" != "no"; then
-  LIBS="$LIBS -L$gmp_libdir"
+  LDFLAGS="$LDFLAGS -L$gmp_libdir"
+  LDIR_FLAGS="$LDIR_FLAGS -L$gmp_libdir"
 fi
 
 USE_GMP=0
@@ -14914,15 +14972,11 @@ fi
 
   fi
   if test "$gmp_ok" = yes; then
-    LIBS="$LIBS -lgmp"
+    LIBS="-lgmp $LIBS"
     USE_GMP=1
   fi
 fi
 
-if test "$USE_GMP" = "0"; then
-  CPPFLAGS="$cppflags_temp";
-  LIBS="$libs_temp";
-fi
 
 
 #--------------------------------------------------------------------
@@ -15065,14 +15119,14 @@ if test "${with_libiconv_library+set}" = set; then
 else
   libiconv_libdir="no"
 fi;
-  ldflags_temp="$LDFLAGS"
 
   if test "$libiconv_libdir" != "no"; then
     LDFLAGS="$LDFLAGS -L$libiconv_libdir"
+    LDIR_FLAGS="$LDIR_FLAGS -L$libiconv_libdir"
   fi
 
   old_LIBS="$LIBS"
-  LIBS="$LIBS -liconv"
+  LIBS="-liconv $LIBS"
   cat >conftest.$ac_ext <<_ACEOF
 #include <iconv.h>
   int main(int argc,char **argv) { iconv_open("foo","bar"); }
@@ -15115,7 +15169,6 @@ else
 sed 's/^/| /' conftest.$ac_ext >&5
 
 found_iconv=no
-    LDFLAGS="$ldflags_temp"
     LIBS="$old_LIBS"
 
 fi
@@ -15127,7 +15180,7 @@ if test $found_iconv = no ; then
   # -liconv didn't work. Try giconv.h and -lgiconv.
   # BSDs install this lib as libgiconv.
   old_LIBS="$LIBS"
-  LIBS="$LIBS -lgiconv"
+  LIBS="-lgiconv $LIBS"
   cat >conftest.$ac_ext <<_ACEOF
 #include <giconv.h>
   int main(int argc,char **argv) { iconv_open("foo","bar"); }
@@ -15184,6 +15237,35 @@ fi
 
 
 
+#--------------------------------------------------------------------
+# Configure flags from sub-configure runs, so they show up in our
+# help file.
+#--------------------------------------------------------------------
+# Check whether --enable-openssl or --disable-openssl was given.
+if test "${enable_openssl+set}" = set; then
+  enableval="$enable_openssl"
+
+else
+  enable_openssl=yes
+fi;
+
+# Check whether --with-openssl-include or --without-openssl-include was given.
+if test "${with_openssl_include+set}" = set; then
+  withval="$with_openssl_include"
+  openssl_incdir="$withval"
+else
+  openssl_incdir="no"
+fi;
+
+# Check whether --with-openssl-library or --without-openssl-library was given.
+if test "${with_openssl_library+set}" = set; then
+  withval="$with_openssl_library"
+  openssl_libdir="$withval"
+else
+  openssl_libdir="no"
+fi;
+
+
 
 subdirs="$subdirs Source/mframe SSL"
 
@@ -15892,6 +15974,7 @@ s,@HAVE_LIBXSLT@,$HAVE_LIBXSLT,;t t
 s,@HAVE_LIBXML@,$HAVE_LIBXML,;t t
 s,@USE_GMP@,$USE_GMP,;t t
 s,@INCLUDE_FLAGS@,$INCLUDE_FLAGS,;t t
+s,@LDIR_FLAGS@,$LDIR_FLAGS,;t t
 s,@subdirs@,$subdirs,;t t
 s,@VERSION@,$VERSION,;t t
 s,@MAJOR_VERSION@,$MAJOR_VERSION,;t t

configure.ac

@@ -62,7 +62,7 @@ AC_PATH_PROG(WHOAMI, whoami, echo, $PATH:/usr/ucb)
 # specific target_os options
 #--------------------------------------------------------------------
 INCLUDE_FLAGS="$CPPFLAGS"
-LIBS="$LDFLAGS $LIBS"
+LDIR_FLAGS="$LDFLAGS"
 # This is just for configuring. Later, in config.make, INCLUDE_FLAGS
 # goes in CONFIG_SYSTEM_INCL and LIBS goes in CONFIG_SYSTEM_LIBS
 case "$target_os" in
@@ -547,6 +547,13 @@ dnl AC_REPLACE_FUNCS(getrusage gettimeofday)
 AC_CHECK_HEADERS(time.h sys/time.h tzfile.h sys/rusage.h ucbinclude/sys/resource.h)
 AC_CHECK_FUNCS(time ctime tzset)
 
+# Check if tzfile contains the proper definitions
+if test $ac_cv_header_tzfile_h = yes; then
+  AC_EGREP_HEADER(tzhead, tzfile.h, 
+	AC_DEFINE(HAVE_TZHEAD,1,
+                  [ Define if tzfile.h includes the proper definitions]),)
+fi
+
 #--------------------------------------------------------------------
 # These headers/functions needed by GSTcpPort.m
 #--------------------------------------------------------------------
@@ -899,6 +906,25 @@ esac
 AC_SUBST(GS_FAKE_MAIN)
 AC_MSG_RESULT($enable_fake_main)
 
+#--------------------------------------------------------------------
+# Simple way to add a bunch of paths to the flags
+#--------------------------------------------------------------------
+AC_ARG_WITH(include-flags,
+    [  --with-include-flags=FLAGS specify all include flags at once],
+    include_flags="$withval", include_flags="no")
+if test ${include_flags} != "no"; then
+    CPPFLAGS="$CPPFLAGS ${include_flags}"
+    INCLUDE_FLAGS="$INCLUDE_FLAGS ${include_flags}"
+fi
+
+AC_ARG_WITH(library-flags,
+    [  --with-library-flags=FLAGS specify all library flags at once],
+    library_flags="$withval", library_flags="no")
+if test ${library_flags} != "no"; then
+    LDFLAGS="$LDFLAGS ${library_flags}"
+    LDIR_FLAGS="$LDIR_FLAGS ${library_flags}"
+fi
+
 #--------------------------------------------------------------------
 # Check for FFI interface libraries for invocations
 # We enable ffcall by default now.
@@ -930,15 +956,16 @@ AC_ARG_WITH(ffi-include,
     [  --with-ffi-include=PATH include path for ffi (ffcall/libffi) headers],
     ffi_incdir="$withval", ffi_incdir="no")
 if test ${ffi_incdir} != "no"; then
-    CPPFLAGS="-I${ffi_incdir} $CPPFLAGS"
+    CPPFLAGS="$CPPFLAGS -I${ffi_incdir}"
-    INCLUDE_FLAGS="-I${ffi_incdir} $INCLUDE_FLAGS"
+    INCLUDE_FLAGS="$INCLUDE_FLAGS -I${ffi_incdir}"
 fi
 
 AC_ARG_WITH(ffi-library,
     [  --with-ffi-library=PATH library path for ffi (ffcall/libffi) libraries],
     ffi_libdir="$withval", ffi_libdir="no")
 if test ${ffi_libdir} != "no"; then
-    LIBS="-L${ffi_libdir} $LIBS"
+    LDFLAGS="$LDFLAGS -L${ffi_libdir}"
+    LDIR_FLAGS="$LDIR_FLAGS -L${ffi_libdir}"
 fi
 
 AC_CHECK_HEADER(ffi.h, have_libffi=yes, have_libffi=no)
@@ -969,13 +996,13 @@ if test $enable_libffi = yes; then
   AC_DEFINE(USE_LIBFFI,1,
             [Define if using the libffi library for invocations])
   WITH_FFI=libffi
-  LIBS="$LIBS -lffi"
+  LIBS="-lffi $LIBS"
   AC_MSG_RESULT(libffi)
 elif test $enable_ffcall = yes; then
   AC_DEFINE(USE_FFCALL,1,
             [Define if using the ffcall library for invocations])
   WITH_FFI=ffcall
-  LIBS="$LIBS -lcallback -lavcall"
+  LIBS="-lcallback -lavcall $LIBS"
   AC_MSG_RESULT(ffcall)
 else
   AC_MSG_RESULT(none)
@@ -1021,7 +1048,7 @@ if test $enable_xml = yes; then
   if test $enable_libxml = yes; then
     CPPFLAGS="$CPPFLAGS $XML_CFLAGS"
     INCLUDE_FLAGS="$INCLUDE_FLAGS $XML_CFLAGS"
-    LIBS="$LIBS $XML_LIBS"
+    LIBS="$XML_LIBS $LIBS"
     HAVE_LIBXML=1
     AC_DEFINE(HAVE_LIBXML,1,[Define if libxml available])
     AC_CHECK_HEADERS(libxml/SAX2.h)
@@ -1043,7 +1070,7 @@ if test $enable_xml = yes; then
       if test "$xslt_ok" = "yes"; then
 	HAVE_LIBXSLT=1
 	AC_DEFINE(HAVE_LIBXSLT,1,[Define if libxslt available])
-	LIBS="$LIBS -lxslt"
+	LIBS="-lxslt $LIBS"
       else
 	echo
 	echo "You most likely do not want to build base without XSLT support."
@@ -1086,7 +1113,6 @@ AC_ARG_WITH(gmp-library,
   [  --with-gmp-library=PATH  library path for gmp libraries],
   gmp_libdir="$withval", gmp_libdir="no")
 
-cppflags_temp="$CPPFLAGS"
 libs_temp=$LIBS
 
 if test "$gmp_incdir" != "no"; then
@@ -1094,7 +1120,8 @@ if test "$gmp_incdir" != "no"; then
   INCLUDE_FLAGS="$INCLUDE_FLAGS -I$gmp_incdir"
 fi
 if test "$gmp_libdir" != "no"; then
-  LIBS="$LIBS -L$gmp_libdir"
+  LDFLAGS="$LDFLAGS -L$gmp_libdir"
+  LDIR_FLAGS="$LDIR_FLAGS -L$gmp_libdir"
 fi
 
 USE_GMP=0
@@ -1105,15 +1132,11 @@ if test $ac_cv_header_gmp_h = yes; then
     AC_CHECK_LIB(gmp, __gmpf_abs, gmp_ok=yes, gmp_ok=no)
   fi
   if test "$gmp_ok" = yes; then
-    LIBS="$LIBS -lgmp"
+    LIBS="-lgmp $LIBS"
     USE_GMP=1
   fi
 fi
 
-if test "$USE_GMP" = "0"; then
-  CPPFLAGS="$cppflags_temp";
-  LIBS="$libs_temp";
-fi
 AC_SUBST(USE_GMP)
 
 #--------------------------------------------------------------------
@@ -1151,14 +1174,14 @@ if test $found_iconv = no ; then
   AC_ARG_WITH(libiconv-library,
     [  --with-libiconv-library=PATH  library path for libiconv libraries],
     libiconv_libdir="$withval", libiconv_libdir="no")
-  ldflags_temp="$LDFLAGS"
 
   if test "$libiconv_libdir" != "no"; then
     LDFLAGS="$LDFLAGS -L$libiconv_libdir"
+    LDIR_FLAGS="$LDIR_FLAGS -L$libiconv_libdir"
   fi
 
   old_LIBS="$LIBS"
-  LIBS="$LIBS -liconv"
+  LIBS="-liconv $LIBS"
   AC_LINK_IFELSE([[#include <iconv.h>
   int main(int argc,char **argv) { iconv_open("foo","bar"); }]]
   ,
@@ -1168,7 +1191,6 @@ if test $found_iconv = no ; then
     found_iconv=yes
   ,
     found_iconv=no
-    LDFLAGS="$ldflags_temp"
     LIBS="$old_LIBS"
   )
 fi
@@ -1177,7 +1199,7 @@ if test $found_iconv = no ; then
   # -liconv didn't work. Try giconv.h and -lgiconv.
   # BSDs install this lib as libgiconv.
   old_LIBS="$LIBS"
-  LIBS="$LIBS -lgiconv"
+  LIBS="-lgiconv $LIBS"
   AC_LINK_IFELSE([[#include <giconv.h>
   int main(int argc,char **argv) { iconv_open("foo","bar"); }]]
   ,
@@ -1191,6 +1213,21 @@ if test $found_iconv = no ; then
 fi
 
 AC_SUBST(INCLUDE_FLAGS)
+AC_SUBST(LDIR_FLAGS)
+
+#--------------------------------------------------------------------
+# Configure flags from sub-configure runs, so they show up in our
+# help file.
+#--------------------------------------------------------------------
+AC_ARG_ENABLE(openssl,
+  [  --disable-openssl		Disable support for openssl in URL classes],,
+  enable_openssl=yes)
+AC_ARG_WITH(openssl-include,
+  [  --with-openssl-include=PATH  include path for openssl headers],
+  openssl_incdir="$withval", openssl_incdir="no")
+AC_ARG_WITH(openssl-library,
+  [  --with-openssl-library=PATH  library path for openssl libraries],
+  openssl_libdir="$withval", openssl_libdir="no")
 
 AC_CONFIG_SUBDIRS(Source/mframe SSL)