Changeset 998

Timestamp:

2000-03-01T10:54:18+13:00 (24 years ago)

Author:

sjboddie

Message:

tidied up configuration a bit

Location:

trunk/gsdl

Files:

• builddemo.sh (modified) (2 diffs)
• config.h.in (modified) (3 diffs)
• configure (modified) (1 diff)
• configure.in (modified) (1 diff)

trunk/gsdl/builddemo.sh

@@ -7 +7 @@
 
 # set some environment variables
-export GSDLHOME=`pwd`
-export GSDLOS=`uname -s | tr A-Z a-z`
-export PATH=$PATH:$GSDLHOME/bin/script:$GSDLHOME/bin/$GSDLOS
+GSDLHOME=`pwd`
+export GSDLHOME
+GSDLOS=`uname -s | tr A-Z a-z`
+export GSDLOS
+PATH=$PATH:$GSDLHOME/bin/script:$GSDLHOME/bin/$GSDLOS
+export PATH
 
 # do the import
 import.pl demo
 
-if test ! -e $GSDLHOME/collect/demo/archives/archives.inf; then
+if (test ! -e $GSDLHOME/collect/demo/archives/archives.inf;) then
     echo "import.pl failed"; exit 1;
 fi
@@ -21 +24 @@
 buildcol.pl demo
 
-if test ! -e $GSDLHOME/collect/demo/building/text/demo.ldb; then
-    if test ! -e $GSDLHOME/collect/demo/building/text/demo.bdb; then
+if (test ! -e $GSDLHOME/collect/demo/building/text/demo.ldb;) then
+    if (test ! -e $GSDLHOME/collect/demo/building/text/demo.bdb;) then
     echo "buildcol.pl failed"; exit 1;
     fi
 fi
 
-if test ! -d $GSDLHOME/collect/demo/building/index; then
-#    rm -rf $GSDLHOME/collect/demo/index/*
-else 
+if (test ! -d $GSDLHOME/collect/demo/building/index;) then
     mkdir $GSDLHOME/collect/demo/index
 fi

trunk/gsdl/config.h.in

@@ -141 +141 @@
 #undef HAVE_VALLOC
 
+/* Define if you have the <crypt.h> header file.  */
+#undef HAVE_CRYPT_H
+
 /* Define if you have the <dirent.h> header file.  */
 #undef HAVE_DIRENT_H
@@ -174 +177 @@
 #undef HAVE_UNISTD_H
 
+/* Define if you have the crypt library (-lcrypt).  */
+#undef HAVE_LIBCRYPT
+
 /* Define if you have the g library (-lg).  */
 #undef HAVE_LIBG
@@ -183 +189 @@
 #undef HAVE_LIBM
 
-/* Define if you have the stdc library (-lstdc).  */
-#undef HAVE_LIBSTDC
+/* Define if you have the stdc++ library (-lstdc++).  */
+#undef HAVE_LIBSTDC__

trunk/gsdl/configure

@@ -2196 +2196 @@
 fi
 
-for ac_hdr in fcntl.h limits.h sys/time.h unistd.h string.h memory.h sys/procfs.h
+for ac_hdr in fcntl.h limits.h sys/time.h unistd.h crypt.h string.h memory.h sys/procfs.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`

trunk/gsdl/configure.in

@@ -74 +74 @@
 AC_HEADER_DIRENT
 AC_HEADER_STDC
-AC_CHECK_HEADERS(fcntl.h limits.h sys/time.h unistd.h string.h memory.h sys/procfs.h)
+AC_CHECK_HEADERS(fcntl.h limits.h sys/time.h unistd.h crypt.h string.h memory.h sys/procfs.h)
 AC_EGREP_HEADER(fread, stdio.h, AC_DEFINE(HAVE_FREAD_DECL))
 AC_EGREP_HEADER(fgetc, stdio.h, AC_DEFINE(HAVE_FGETC_DECL))