changes

2004-09-29 09:16:21 +00:00 · 2004-09-29 09:16:21 +00:00 · 90a5044fa9
commit 90a5044fa9
parent 47d312d79f
2 changed files with 79 additions and 33 deletions
--- a/smmapdfw/Makefile.in
+++ b/smmapdfw/Makefile.in
@ -92,11 +92,11 @@ DIST_SUBDIRS = $(BUILD_SUBDIRS)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =  rules.mk
+CONFIG_CLEAN_FILES = 
 DIST_COMMON =  README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \
 Makefile.am Makefile.in NEWS aclocal.m4 config.guess config.h.in \
 config.sub configure configure.ac install-sh ltmain.sh missing \
-mkinstalldirs rules.mk.in
+mkinstalldirs


 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
@ -147,8 +147,6 @@ distclean-hdr:
 	-rm -f config.h

 maintainer-clean-hdr:
-rules.mk: $(top_builddir)/config.status rules.mk.in
-	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status

 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
--- a/smmapdfw/configure
+++ b/smmapdfw/configure
@ -1029,7 +1029,7 @@ Optional Features:
  --enable-maintainer-mode enable make rules and dependencies not useful
                          (and sometimes confusing) to the casual installer
  --enable-verify-cache   Enables the cache in the verify worker. Required a
-                          dbm implemenation. (default)
+                          dbm implemenation. (default=yes)
  --enable-shared[=PKGS]
                          build shared libraries [default=yes]
  --enable-static[=PKGS]
@ -1041,6 +1041,8 @@ Optional Features:
 Optional Packages:
  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-bdb-lib-dir      Directory for Berkeley DB library files
+  --with-bdb-inc-dir      Directory for Berkeley include files
  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
  --with-pic              try to use only PIC/non-PIC objects [default=use
                          both]
@ -1846,6 +1848,49 @@ _ACEOF



+# Check whether --with-bdb-lib-dir or --without-bdb-lib-dir was given.
+if test "${with_bdb_lib_dir+set}" = set; then
+  withval="$with_bdb_lib_dir"
+   case "$withval" in
+                no)
+                  if test "x$ENABLE_VERIFY_CACHE" = "x1"; then
+                    { { echo "$as_me:$LINENO: error: Need bdb-lib-dir" >&5
+echo "$as_me: error: Need bdb-lib-dir" >&2;}
+   { (exit 1); exit 1; }; }
+                  fi
+                  ;;
+                yes)
+                  ;;
+                *)
+                  LDFLAGS="$LDFLAGS -L$withval"
+                  ;;
+            esac
+
+fi;
+
+
+# Check whether --with-bdb-inc-dir or --without-bdb-inc-dir was given.
+if test "${with_bdb_inc_dir+set}" = set; then
+  withval="$with_bdb_inc_dir"
+   case "$withval" in
+                no)
+                  if test "x$ENABLE_VERIFY_CACHE" = "x1"; then
+                    { { echo "$as_me:$LINENO: error: Need bdb-inc-dir" >&5
+echo "$as_me: error: Need bdb-inc-dir" >&2;}
+   { (exit 1); exit 1; }; }
+                  fi
+                  ;;
+                yes)
+                  ;;
+                *)
+                  CPPFLAGS="$CPPFLAGS -I$withval"
+                  ;;
+            esac
+
+fi;
+
+
+
 # Checks for programs.
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@ -3370,7 +3415,7 @@ ia64-*-hpux*)
  ;;
 *-*-irix6*)
  # Find out which ABI we are using.
-  echo '#line 3373 "configure"' > conftest.$ac_ext
+  echo '#line 3418 "configure"' > conftest.$ac_ext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
@ -4825,7 +4870,7 @@ fi


 # Provide some information about the compiler.
-echo "$as_me:4828:" \
+echo "$as_me:4873:" \
     "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@ -5857,11 +5902,11 @@ else
   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:5860: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:5905: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:5864: \$? = $ac_status" >&5
+   echo "$as_me:5909: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings
@ -6090,11 +6135,11 @@ else
   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6093: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6138: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:6097: \$? = $ac_status" >&5
+   echo "$as_me:6142: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings
@ -6150,11 +6195,11 @@ else
   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6153: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6198: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:6157: \$? = $ac_status" >&5
+   echo "$as_me:6202: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   then
     # The compiler can only warn and ignore the option if not recognized
@ -8338,7 +8383,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<EOF
-#line 8341 "configure"
+#line 8386 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H
@ -8436,7 +8481,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<EOF
-#line 8439 "configure"
+#line 8484 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H
@ -10613,11 +10658,11 @@ else
   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10616: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10661: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:10620: \$? = $ac_status" >&5
+   echo "$as_me:10665: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings
@ -10673,11 +10718,11 @@ else
   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10676: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10721: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:10680: \$? = $ac_status" >&5
+   echo "$as_me:10725: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   then
     # The compiler can only warn and ignore the option if not recognized
@ -12042,7 +12087,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<EOF
-#line 12045 "configure"
+#line 12090 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H
@ -12140,7 +12185,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<EOF
-#line 12143 "configure"
+#line 12188 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H
@ -12967,11 +13012,11 @@ else
   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12970: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13015: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:12974: \$? = $ac_status" >&5
+   echo "$as_me:13019: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings
@ -13027,11 +13072,11 @@ else
   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13030: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13075: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:13034: \$? = $ac_status" >&5
+   echo "$as_me:13079: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   then
     # The compiler can only warn and ignore the option if not recognized
@ -15072,11 +15117,11 @@ else
   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15075: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15120: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:15079: \$? = $ac_status" >&5
+   echo "$as_me:15124: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings
@ -15305,11 +15350,11 @@ else
   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15308: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15353: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:15312: \$? = $ac_status" >&5
+   echo "$as_me:15357: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings
@ -15365,11 +15410,11 @@ else
   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15368: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15413: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:15372: \$? = $ac_status" >&5
+   echo "$as_me:15417: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   then
     # The compiler can only warn and ignore the option if not recognized
@ -17553,7 +17598,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<EOF
-#line 17556 "configure"
+#line 17601 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H
@ -17651,7 +17696,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<EOF
-#line 17654 "configure"
+#line 17699 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H
@ -19177,6 +19222,7 @@ _ACEOF
 fi


+
 # Checks for header files.
 echo "$as_me:$LINENO: checking for ANSI C header files" >&5
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
@ -19502,6 +19548,7 @@ fi
 done


+
 # Checks for typedefs, structures, and compiler characteristics.
 echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
@ -21170,6 +21217,7 @@ done



+
                                                            ac_config_files="$ac_config_files Makefile libsmmapdfw/Makefile smmapd/Makefile modules/test/Makefile modules/verify/Makefile modules/cyrus/Makefile"