diff options
| author | Guy Harris <guy@alum.mit.edu> | 2003-03-25 23:37:54 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2003-03-25 23:37:54 +0000 |
| commit | 97f273f0443eb49847fd60a8648d5890ff2d2db3 (patch) | |
| tree | e571abdd5b08f8660c2a4ca55a2bf316cc84618b /epan/configure.in | |
| parent | 170b802890acaa491386aff046d7cc0df3450cc1 (diff) | |
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.
Define DATAFILE_DIR in config.h as the all-variables-expanded version of
$datadir/ethereal, as that's where the global configuration files such
as manuf and the Diameter files are actually installed.
svn path=/trunk/; revision=7368
Diffstat (limited to 'epan/configure.in')
| -rw-r--r-- | epan/configure.in | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/epan/configure.in b/epan/configure.in index 8bfc698735..b03aa053b3 100644 --- a/epan/configure.in +++ b/epan/configure.in @@ -1,4 +1,4 @@ -# $Id: configure.in,v 1.40 2003/03/11 00:12:39 gerald Exp $ +# $Id: configure.in,v 1.41 2003/03/25 23:37:54 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 @@ -107,14 +107,13 @@ else fi # Create DATAFILE_DIR #define for config.h -DATAFILE_DIR=$sysconfdir -DATAFILE_DIR=`( +datafiledir=$datadir/ethereal +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", [Directory for data]) -AC_SUBST(DATAFILE_DIR) +AC_DEFINE_UNQUOTED(DATAFILE_DIR,"$datafiledir", [Directory for data]) AC_ARG_ENABLE(gtk2, [ --enable-gtk2 build Glib2/Gtk2+-based (t)ethereal. [default=no]],enable_gtk2=$enableval,enable_gtk2=no) |