diff options
| -rw-r--r-- | Makefile.am.inc | 2 | ||||
| -rw-r--r-- | configure.ac | 25 | ||||
| -rw-r--r-- | ui/Makefile.am | 3 | ||||
| -rw-r--r-- | wsutil/Makefile.am | 6 |
4 files changed, 8 insertions, 28 deletions
diff --git a/Makefile.am.inc b/Makefile.am.inc index 2224f4f035..5f5d10125a 100644 --- a/Makefile.am.inc +++ b/Makefile.am.inc @@ -27,7 +27,7 @@ LEMON = $(top_builddir)/tools/lemon/lemon$(EXEEXT) RUNLEX = $(top_srcdir)/tools/runlex.sh -AM_CPPFLAGS = $(WS_CPPFLAGS) -I$(top_srcdir) -DTOP_SRCDIR=\"$(abs_top_srcdir)\" +AM_CPPFLAGS = $(WS_CPPFLAGS) -I$(top_srcdir) AM_CFLAGS = $(WS_CFLAGS) diff --git a/configure.ac b/configure.ac index e170fb03b7..454f625e41 100644 --- a/configure.ac +++ b/configure.ac @@ -1538,29 +1538,6 @@ else AC_MSG_RESULT(no) fi -# Create DATAFILE_DIR #define for config.h -datafiledir=$datadir/wireshark -datafiledir=`( - test "x$prefix" = xNONE && prefix=$ac_default_prefix - test "x$exec_prefix" = xNONE && exec_prefix=${prefix} - # Ugly hack, but I don't see how this problem can be solved - # properly that DATAFILE_DIR had a value starting with - # "${prefix}/" instead of e.g. "/usr/local/" - eval eval echo "$datafiledir" -)` -AC_DEFINE_UNQUOTED(DATAFILE_DIR,"$datafiledir", [Directory for data]) - -# Create DOC_DIR #define for config.h -docdir=`( - test "x$prefix" = xNONE && prefix=$ac_default_prefix - test "x$exec_prefix" = xNONE && exec_prefix=${prefix} - # Ugly hack, but I don't see how this problem can be solved - # properly that DOC_DIR had a value starting with - # "${prefix}/" instead of e.g. "/usr/local/" - eval eval echo "$docdir" -)` -AC_DEFINE_UNQUOTED(DOC_DIR, "$docdir", [Directory for docs]) - GTK2_MIN_VERSION=2.12.0 AC_SUBST(GTK2_MIN_VERSION) GTK3_MIN_VERSION=3.0.0 @@ -3047,7 +3024,6 @@ then AC_DEFINE(HAVE_PLUGINS, 1, [Define if plugins are enabled]) fi AC_SUBST(plugindir) -WS_CPPFLAGS="$WS_CPPFLAGS '-DPLUGIN_INSTALL_DIR=\"\$(plugindir)\"'" # # The plugin dissectors reside in ./plugins/PROTO/ @@ -3082,7 +3058,6 @@ then AC_DEFINE(HAVE_EXTCAP, 1, [Define if external capture sources should be enabled]) fi AC_SUBST(extcapdir) -WS_CPPFLAGS="$WS_CPPFLAGS '-DEXTCAP_DIR=\"\$(extcapdir)\"'" if test "x$enable_sshdump" = "xyes" ; then if test "x$have_good_libssh" = "xyes" ; then diff --git a/ui/Makefile.am b/ui/Makefile.am index 4b409209fd..6c6e98db04 100644 --- a/ui/Makefile.am +++ b/ui/Makefile.am @@ -23,7 +23,8 @@ include Makefile.common include $(top_srcdir)/Makefile.am.inc -AM_CPPFLAGS += $(LIBGCRYPT_CFLAGS) $(LIBGNUTLS_CFLAGS) $(PORTAUDIO_INCLUDES) +AM_CPPFLAGS += $(LIBGCRYPT_CFLAGS) $(LIBGNUTLS_CFLAGS) $(PORTAUDIO_INCLUDES) \ + -DDOC_DIR=\"$(docdir)\" noinst_LIBRARIES = libui.a libui_dirty.a diff --git a/wsutil/Makefile.am b/wsutil/Makefile.am index e7b0813093..f718f42d5e 100644 --- a/wsutil/Makefile.am +++ b/wsutil/Makefile.am @@ -23,7 +23,11 @@ include $(top_srcdir)/Makefile.am.inc ACLOCAL_AMFLAGS = `../aclocal-flags` -AM_CPPFLAGS += $(LIBGCRYPT_CFLAGS) -DWS_BUILD_DLL +AM_CPPFLAGS += $(LIBGCRYPT_CFLAGS) -DWS_BUILD_DLL \ + -DTOP_SRCDIR=\"$(abs_top_srcdir)\" \ + -DDATAFILE_DIR=\"$(pkgdatadir)\" \ + -DEXTCAP_DIR=\"$(extcapdir)\" \ + -DPLUGIN_INSTALL_DIR=\"$(plugindir)\" # Optional headers for ABI checking wsutil_optional_abi_includes = |