diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2004-03-04 08:53:02 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2004-03-04 08:53:02 +0000 |
| commit | 9ff6f3d593ffba053c4f4e1d97230033428cabd3 (patch) | |
| tree | 62b04d73e9baef09a2dc004edd9708c856793879 | |
| parent | 0956858f5a352c1571773e227b15b3b9d0c34c5d (diff) | |
Check for PERL in epan/configure.in
Fix generation of x11 includes.
svn path=/trunk/; revision=10301
| -rw-r--r-- | Makefile.common | 6 | ||||
| -rw-r--r-- | epan/Makefile.common | 6 | ||||
| -rw-r--r-- | epan/configure.in | 4 |
3 files changed, 9 insertions, 7 deletions
diff --git a/Makefile.common b/Makefile.common index e1fdd8467c..fcbafb8524 100644 --- a/Makefile.common +++ b/Makefile.common @@ -3,7 +3,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common,v 1.26 2004/03/02 01:21:56 jmayer Exp $ +# $Id: Makefile.common,v 1.27 2004/03/04 08:53:01 jmayer Exp $ # # Ethereal - Network traffic analyzer # By Gerald Combs <gerald@ethereal.com> @@ -240,9 +240,7 @@ DISSECTOR_SUPPORT_INCLUDES = \ # "BUILT_SOURCES" are built before any "make all" or "make check" targets. BUILT_SOURCES = \ - cvsversion.h \ - x11-declarations.h \ - x11-register-info.h + cvsversion.h # sources common for ethereal and tethereal ETHEREAL_COMMON_SRC = \ diff --git a/epan/Makefile.common b/epan/Makefile.common index 6e97d6764d..244209edcf 100644 --- a/epan/Makefile.common +++ b/epan/Makefile.common @@ -3,7 +3,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common,v 1.2 2004/03/02 01:48:31 jmayer Exp $ +# $Id: Makefile.common,v 1.3 2004/03/04 08:53:02 jmayer Exp $ # # Ethereal - Network traffic analyzer # By Gerald Combs <gerald@ethereal.com> @@ -478,5 +478,7 @@ DISSECTOR_SUPPORT_SRC = \ # "BUILT_SOURCES" are built before any "make all" or "make check" targets. BUILT_SOURCES = \ - register.c + register.c \ + x11-declarations.h \ + x11-register-info.h diff --git a/epan/configure.in b/epan/configure.in index 58d8e2566f..1bdb600949 100644 --- a/epan/configure.in +++ b/epan/configure.in @@ -1,4 +1,4 @@ -# $Id: configure.in,v 1.64 2004/03/04 06:29:42 guy Exp $ +# $Id: configure.in,v 1.65 2004/03/04 08:53:02 jmayer Exp $ # AC_INIT(epan.c) @@ -20,9 +20,11 @@ AC_PROG_YACC AM_PROG_LEX AC_PROG_LIBTOOL AC_PATH_PROG(LEX, flex) +AC_PATH_PROG(PERL, perl) AC_PATH_PROG(PYTHON, python) AC_SUBST(FLEX_PATH) +AC_SUBST(PERL) AC_SUBST(PYTHON) # |