[Grapevine-cvs-commits] cvs: grapevine / config.h.in configure configure.ac

[blackh <gra...@li...>]

blackh		Wed Nov 26 20:28:14 2003 EDT

  Modified files:              
    /grapevine	config.h.in configure configure.ac 
  Log:
  Makefile tweaks.
  
  
Index: grapevine/configure.ac
diff -u grapevine/configure.ac:1.48 grapevine/configure.ac:1.49
--- grapevine/configure.ac:1.48	Tue Nov 25 12:55:24 2003
+++ grapevine/configure.ac	Wed Nov 26 20:28:14 2003
@@ -5,7 +5,7 @@
 AC_INIT(GrapevineC++Engine, 1.0.6)
 AC_PREREQ(2.50)
 AM_CONFIG_HEADER(config.h)
-AC_REVISION($Revision: 1.48 $)
+AC_REVISION($Revision: 1.49 $)
 
 PACKAGE="$PACKAGE_NAME"
 VERSION="$PACKAGE_VERSION"
@@ -131,9 +131,7 @@
 #DBLIB=/usr/local/BerkeleyDB/lib
 #DBLIBNAME_TRIES=db
 
-EXPATROOT=/usr/local
-EXPATINCLUDE=/usr/local/include
-EXPATLIB=/usr/local/lib
+EXPATROOT=/usr
 EXPATLIBNAME=expat
 
 dnl to support a new system, you need to add its canonical name (as determined
@@ -243,8 +241,8 @@
     RESCOMP=windres
 #    DBINCLUDE=/usr/include/db3
 #    DBLIB=/lib
-    EXPATINCLUDE=/usr/include
-    EXPATLIB=/lib
+    #EXPATINCLUDE=/usr/include
+    #EXPATLIB=/lib
   ;;
 
   *-pc-msdosdjgpp )
@@ -737,7 +735,7 @@
 dnl expat
 dnl ---------------------------------------------------------------------------
 
-AC_ARG_WITH(expat-root,      [  --with-expat-root=<dir>       Specify Expat root directory,        default=/usr/local],
+AC_ARG_WITH(expat-root,      [  --with-expat-root=<dir>       Specify Expat root directory,        default=/usr],
   EXPATROOT=$withval
 )
 if test "$EXPATROOT" != "" ; then
@@ -745,10 +743,10 @@
   EXPATLIB="$EXPATROOT/lib"
 fi
 
-AC_ARG_WITH(expat-include,   [  --with-expat-include=<dir>    Specify Expat include directory,     default=/usr/local/include],
+AC_ARG_WITH(expat-include,   [  --with-expat-include=<dir>    Specify Expat include directory,     default=/usr/include],
   EXPATINCLUDE=$withval
 )
-AC_ARG_WITH(expat-lib,       [  --with-expat-lib=<dir>        Specify Expat library directory,     default=/usr/local/lib],
+AC_ARG_WITH(expat-lib,       [  --with-expat-lib=<dir>        Specify Expat library directory,     default=/usr/lib],
   EXPATLIB=$withval
 )
 AC_ARG_WITH(expat-libname,   [  --with-expat-libname=<name>   Specify Expat library name,          default=expat],
@@ -1001,8 +999,12 @@
 TARGET=$target
 
 CRYPTOPP_CPPFLAGS="${CRYPTOPP_CPPFLAGS} ${CPPFLAGS}"
-AC_DEFINE_UNQUOTED(DATADIR, ["`eval echo $datadir`"], [Architecture-independent data directory])
-AC_DEFINE_UNQUOTED(CONFIG_FILE, ["`eval echo $sysconfdir`/grapevine-config.xml"], [Grapevine configuration file])
+
+CONFIG_FILE="$sysconfdir/grapevine-config.xml"
+AC_ARG_WITH(config-file,    [  --with-config-file=<file>     Specify location of grapevine config file],
+  CONFIG_FILE="$withval"
+)
+CPPFLAGS="$CPPFLAGS -DDATADIR=$datadir -DCONFIG_FILE=$CONFIG_FILE"
 
 AC_SUBST(ac_doc_dir)
 AC_SUBST(ac_lib_dir)