diff options
| author | Guy Harris <guy@alum.mit.edu> | 2003-01-10 00:03:33 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2003-01-10 00:03:33 +0000 |
| commit | 6b49b2475cae484188cf4d3b216c5271183d157c (patch) | |
| tree | 689401d939a7a480700429aa689da71d5aa664be /configure.in | |
| parent | 9e144356f8e8d826d58407e3ec6a061813766e34 (diff) | |
| download | wireshark-6b49b2475cae484188cf4d3b216c5271183d157c.tar.gz wireshark-6b49b2475cae484188cf4d3b216c5271183d157c.tar.bz2 wireshark-6b49b2475cae484188cf4d3b216c5271183d157c.zip | |
Use "datafiledir" rather than "DATAFILE_DIR" as the name of the variable
in the configure script for the all-variables-expanded version of the
data file directory.
Don't AC_SUBST "DATAFILE_DIR", as it's not used.
svn path=/trunk/; revision=6888
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/configure.in b/configure.in index cc24c9a168..a635a35536 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -# $Id: configure.in,v 1.190 2003/01/09 23:50:52 guy Exp $ +# $Id: configure.in,v 1.191 2003/01/10 00:03:33 guy Exp $ dnl dnl Process this file with autoconf 2.13 or later to produce a dnl configure script; 2.12 doesn't generate a "configure" script that @@ -163,14 +163,13 @@ else fi # Create DATAFILE_DIR #define for config.h -DATAFILE_DIR=$sysconfdir -DATAFILE_DIR=`( +datafiledir=$sysconfdir +datafiledir=`( test "x$prefix" = xNONE && prefix=$ac_default_prefix test "x$exec_prefix" = xNONE && exec_prefix=${prefix} - eval echo "$DATAFILE_DIR" + eval echo "$datafiledir" )` -AC_DEFINE_UNQUOTED(DATAFILE_DIR,"$DATAFILE_DIR") -AC_SUBST(DATAFILE_DIR) +AC_DEFINE_UNQUOTED(DATAFILE_DIR, "$datafiledir") # # If we're running Solaris, and LD_LIBRARY_PATH is defined, add it as a |