Back out the previous change - we were setting "datafiledir", not

"datafile", and code in epan/filesystem.c expectes DATAFILE_DIR to be
set to the "ethereal" subdirectory of the data directory, not to the
data directory itself.

svn path=/trunk/; revision=13322

1 files changed, 9 insertions, 0 deletions

diff --git a/configure.in b/configure.in
index f417af6f82..b51b4e171f 100644
--- a/configure.in
+++ b/configure.in
@@ -318,6 +318,15 @@ else
 	AC_MSG_RESULT(no)
 fi
 
+# Create DATAFILE_DIR #define for config.h
+datafiledir=$datadir/ethereal
+datafiledir=`(
+    test "x$prefix" = xNONE && prefix=$ac_default_prefix
+    test "x$exec_prefix" = xNONE && exec_prefix=${prefix}
+    eval echo "$datafiledir"
+)`
+AC_DEFINE_UNQUOTED(DATAFILE_DIR,"$datafiledir", [Directory for data])
+
 # GTK checks
 # We don't add $GLIB_LIBS to LIBS, because we don't want to force all
 # programs to be built with GTK+.