*** misc/db-3.2.9/cxx/cxx_app.cpp Thu Jan 11 10:28:22 2001 --- misc/build/db-3.2.9/cxx/cxx_app.cpp Sat Apr 12 23:05:59 2003 *************** *** 7,12 **** --- 7,14 ---- #include "db_config.h" + #include + #ifndef lint static const char revid[] = "$Id: cxx_app.cpp,v 11.38 2000/12/21 20:30:18 dda Exp $"; #endif /* not lint */ *** misc/db-3.2.9/cxx/cxx_table.cpp Thu Jan 11 10:28:22 2001 --- misc/build/db-3.2.9/cxx/cxx_table.cpp Sat Apr 12 23:05:59 2003 *************** *** 7,12 **** --- 7,14 ---- #include "db_config.h" + #include + #ifndef lint static const char revid[] = "$Id: cxx_table.cpp,v 11.35 2001/01/11 18:19:49 bostic Exp $"; #endif /* not lint */ *** misc/db-3.2.9/dist/Makefile.in Thu Nov 30 15:07:33 2000 --- misc/build/db-3.2.9/dist/Makefile.in Sat Apr 12 23:05:59 2003 *************** *** 8,14 **** ################################################## CPPFLAGS= -I$(builddir) -I$(srcdir)/include @CPPFLAGS@ CFLAGS= -c $(CPPFLAGS) @CFLAGS@ ! CXXFLAGS= -c $(CPPFLAGS) @CXXFLAGS@ CC= @MAKEFILE_CC@ CCLINK= @MAKEFILE_CCLINK@ --- 8,14 ---- ################################################## CPPFLAGS= -I$(builddir) -I$(srcdir)/include @CPPFLAGS@ CFLAGS= -c $(CPPFLAGS) @CFLAGS@ ! CXXFLAGS= -c $(SOLARINC) $(CPPFLAGS) @CXXFLAGS@ CC= @MAKEFILE_CC@ CCLINK= @MAKEFILE_CCLINK@ *** misc/db-3.2.9/dist/configure Wed Jan 24 07:16:18 2001 --- misc/build/db-3.2.9/dist/configure Sat Apr 12 23:05:59 2003 *************** *** 995,1000 **** --- 995,1003 ---- CPPFLAGS="-D_REENTRANT $CPPFLAGS";; mpeix*) CPPFLAGS="-D_POSIX_SOURCE -D_SOCKET_SOURCE $CPPFLAGS" LIBS="-lsocket -lsvipc $LIBS";; + netbsd*) optimize_def="-O2";; + darwin*) optimize_def="-O2" + CPPFLAGS="-D_REENTRANT -no-cpp-precomp $CPPFLAGS";; osf*) CPPFLAGS="-D_REENTRANT $CPPFLAGS";; *qnx) cat >> confdefs.h <<\EOF #define HAVE_QNX 1 *************** *** 1750,1757 **** for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ! ac_cv_path_JAVACABS="$ac_dir/$ac_word" ! break fi done IFS="$ac_save_ifs" --- 1753,1762 ---- for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ! if test $SOLARENV/$OUTPATH/bin != $ac_dir; then ! ac_cv_path_JAVACABS="$ac_dir/$ac_word" ! break ! fi fi done IFS="$ac_save_ifs" *************** *** 1781,1800 **** echo "$ac_t""$JAVACABS" 1>&6 done JTOPDIR=`echo "$JAVACABS" | sed -e 's://*:/:g' -e 's:/[^/]*$::'` ! if test -f "$JTOPDIR/include/jni.h"; then ! CPPFLAGS="$CPPFLAGSS -I$JTOPDIR/include" ! else ! JTOPDIR=`echo "$JTOPDIR" | sed -e 's:/[^/]*$::'` ! if test -f "$JTOPDIR/include/jni.h"; then ! CPPFLAGS="$CPPFLAGS -I$JTOPDIR/include" ! else ! { echo "configure: error: cannot find java include files" 1>&2; exit 1; } ! fi ! fi case "$host_os" in solaris*) JINCSUBDIRS="solaris";; linux*) JINCSUBDIRS="linux genunix";; *) JINCSUBDIRS="genunix";; esac --- 1786,1825 ---- echo "$ac_t""$JAVACABS" 1>&6 done JTOPDIR=`echo "$JAVACABS" | sed -e 's://*:/:g' -e 's:/[^/]*$::'` ! # [ed] 12/23/01 On OS X/darwin the java include directory is named the traditional Headers ! # name and not include ! # [ed] 2/28/02 Make this generic for darwin ! case "$host_os" in ! darwin*) ! JFRAMEDIR=`echo "$JTOPDIR" | sed -e 's:JavaVM.framework.*$:JavaVM.framework:'` ! echo "$JFRAMEDIR" ! if test -f "$JFRAMEDIR/Headers/jni.h"; then ! CPPFLAGS="$CPPFLAGS -I$JFRAMEDIR/Headers -I$JFRAMEDIR/Headers" ! elif test -f "$JFRAMEDIR/Versions/1.3.1/Headers/jni.h"; then ! CPPFLAGS="$CPPFLAGS -I$JFRAMEDIR/Headers -I$JFRAMEDIR/Versions/1.3.1/Headers" ! else ! { echo "configure: error: cannot find java include files (Darwin: $JFRAMEDIR/Versions/1.3.1/Headers/jni.h)" 1>&2; exit 1; } ! fi ! ;; ! *) ! if test -f "$JTOPDIR/include/jni.h"; then ! CPPFLAGS="$CPPFLAGS -I$JTOPDIR/include" ! else ! JTOPDIR=`echo "$JTOPDIR" | sed -e 's:/[^/]*$::'` ! if test -f "$JTOPDIR/include/jni.h"; then ! CPPFLAGS="$CPPFLAGS -I$JTOPDIR/include" ! else ! { echo "configure: error: cannot find java include files" 1>&2; exit 1; } ! fi ! fi ! ;; ! esac case "$host_os" in solaris*) JINCSUBDIRS="solaris";; linux*) JINCSUBDIRS="linux genunix";; + irix*) JINCSUBDIRS="irix";; + netbsd*) JINCSUBDIRS="netbsd linux solaris genunix";; *) JINCSUBDIRS="genunix";; esac *************** *** 4008,4014 **** #line 4009 "configure" #include "confdefs.h" main(){ ! #if defined(__powerpc__) #if defined(__GNUC__) exit(0); #endif --- 4033,4039 ---- #line 4009 "configure" #include "confdefs.h" main(){ ! #if defined(__powerpc__) || defined(__ppc__) #if defined(__GNUC__) exit(0); #endif *** misc/db-3.2.9/dist/ltconfig Fri Oct 13 13:23:00 2000 --- misc/build/db-3.2.9/dist/ltconfig Sat Apr 12 23:05:59 2003 *************** *** 678,683 **** --- 678,688 ---- cygwin* | mingw* | os2*) # We can build DLLs from non-PIC. ;; + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + pic_flag='-fno-common' + ;; amigaos*) # FIXME: we need at least 68020 code to build shared libraries, but # adding the `-m68020' flag to GCC prevents building anything better, *************** *** 1194,1204 **** netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib' # can we support soname and/or expsyms with a.out? -oliva fi ;; --- 1199,1210 ---- netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib' # can we support soname and/or expsyms with a.out? -oliva + else + archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + need_version=no fi ;; *************** *** 1371,1376 **** --- 1377,1399 ---- hardcode_shlibpath_var=no ;; + darwin* | rhapsody*) + case "$host_os" in + rhapsody* | darwin1.[012]) + allow_undefined_flag='-undefined suppress' + ;; + *) # Darwin 1.3 on + allow_undefined_flag='-flat_namespace -undefined suppress' + ;; + esac + archive_cmds='$nonopt $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs $linkopts -install_name $rpath/$soname $verstring' + # We need to add '_' to the symbols in $export_symbols first + #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols $lib' + hardcode_direct=yes + hardcode_shlibpath_var=no + whole_archive_flag_spec='-all_load $convenience' + ;; + hpux9* | hpux10* | hpux11*) case "$host_os" in hpux9*) archive_cmds='$rm $objdir/$soname~$LD -b +b $install_libdir -o $objdir/$soname $libobjs $deplibs $linkopts~test $objdir/$soname = $lib || mv $objdir/$soname $lib' ;; *************** *** 1443,1454 **** hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator=: ;; - rhapsody*) - archive_cmds='$CC -bundle -undefined suppress -o $lib $libobjs $deplibs $linkopts' - hardcode_libdir_flags_spec='-L$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; sco3.2v5*) archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' --- 1466,1471 ---- *************** *** 1919,1924 **** --- 1936,1962 ---- esac ;; + darwin* | rhapsody*) + dynamic_linker="$host_os dyld" + version_type=darwin + need_lib_prefix=no + need_version=no + deplibs_check_method='file_magic Mach-O dynamically linked shared library' + file_magic_cmd='/usr/bin/file -L' + case "$host_os" in + rhapsody* | darwin1.[012]) + file_magic_test_file='/System/Library/Frameworks/System.framework/System' + ;; + *) # Darwin 1.3 on + file_magic_test_file='/usr/lib/libSystem.dylib' + ;; + esac + library_names_spec='${libname}${release}${versuffix}.$(test .$module = .yes && echo so || echo dylib) ${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib) ${libname}.$(test .$module = .yes && echo so || echo dylib)' + soname_spec='${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib)' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + ;; + gnu*) version_type=linux need_lib_prefix=no *************** *** 2055,2068 **** deplibs_check_method='pass_all' sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; - - rhapsody*) - version_type=sunos - library_names_spec='${libname}.so' - soname_spec='${libname}.so' - shlibpath_var=DYLD_LIBRARY_PATH - deplibs_check_method=pass_all ;; sco3.2v5*) --- 2093,2098 ---- *** misc/db-3.2.9/dist/ltmain.sh Sun Aug 6 11:32:00 2000 --- misc/build/db-3.2.9/dist/ltmain.sh Sat Apr 12 23:05:59 2003 *************** *** 1079,1084 **** --- 1079,1089 ---- # These systems don't actually have c library (as such) continue ;; + *-*-rhapsody* | *-*-darwin1.[012]) + # Rhapsody C library is in the System framework + deplibs="$deplibs -framework System" + continue + ;; esac elif test "$arg" = "-lm"; then case "$host" in *************** *** 1086,1091 **** --- 1091,1101 ---- # These systems don't actually have math library (as such) continue ;; + *-*-rhapsody* | *-*-darwin1.[012]) + # Rhapsody math library is in the System framework + deplibs="$deplibs -framework System" + continue + ;; esac fi deplibs="$deplibs $arg" *************** *** 1753,1758 **** --- 1763,1778 ---- versuffix="-$major-$age-$revision" ;; + darwin) + # Like Linux, but with the current version available in + # verstring for coding it into the library header + major=.`expr $current - $age` + versuffix="$major.$age.$revision" + # Darwin ld doesn't like 0 for these options... + minor_current=`expr $current + 1` + verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" + ;; + *) $echo "$modename: unknown library version type \`$version_type'" 1>&2 echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 *************** *** 1763,1769 **** # Clear the version info if we defaulted, and they specified a release. if test -z "$vinfo" && test -n "$release"; then major= ! verstring="0.0" if test "$need_version" = no; then versuffix= else --- 1783,1798 ---- # Clear the version info if we defaulted, and they specified a release. if test -z "$vinfo" && test -n "$release"; then major= ! case "$version_type" in ! darwin) ! # we can't check for "0.0" in archive_cmds due to quoting ! # problems, so we reset it completely ! verstring="" ! ;; ! *) ! verstring="0.0" ! ;; ! esac if test "$need_version" = no; then versuffix= else *************** *** 1801,1806 **** --- 1830,1840 ---- # option implicitly controls use of -lc or -lc_r. *freebsd*) # defer to whether the user wants -lc, or -lc_r + ;; + + *-*-rhapsody* | *-*-darwin1.[012]) + # Rhapsody C library is in the System framework + deplibs="$deplibs -framework System" ;; *)