chiark
/
gitweb
/
~mdw
/
tripe
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
init/Makefile.am: Switch install-hook to install-data-hook.
[tripe]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index 40fa582771c1c39e14dd3e85e16086fa9150828e..c285d619bdc508a18347c402b0c9bd7e1bdd903e 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-38,6
+38,8
@@
AX_CFLAGS_WARN_ALL
AC_CANONICAL_HOST
AM_PROG_LIBTOOL
AC_CANONICAL_HOST
AM_PROG_LIBTOOL
+AC_CHECK_PROGS([AUTOM4TE], [autom4te])
+
dnl--------------------------------------------------------------------------
dnl C programming environment.
dnl--------------------------------------------------------------------------
dnl C programming environment.
@@
-225,7
+227,7
@@
esac
dnl If we're still interested, find Glib.
case "$haveshark" in
dnl If we're still interested, find Glib.
case "$haveshark" in
- yes) AM_PATH_GLIB
([1.2.0], [], haveshark=false
, [gmodule]) ;;
+ yes) AM_PATH_GLIB
_2_0([2.4.0], [], [haveshark=false]
, [gmodule]) ;;
esac
dnl Find the include directory. This would be much easier if they just
esac
dnl Find the include directory. This would be much easier if they just
@@
-283,10
+285,12
@@
dnl--------------------------------------------------------------------------
dnl Produce output.
AC_CONFIG_HEADER([config/config.h])
dnl Produce output.
AC_CONFIG_HEADER([config/config.h])
+AC_CONFIG_TESTDIR([t])
AC_CONFIG_FILES(
[Makefile]
[common/Makefile]
AC_CONFIG_FILES(
[Makefile]
[common/Makefile]
+ [uslip/Makefile]
[client/Makefile]
[server/Makefile]
[proxy/Makefile]
[client/Makefile]
[server/Makefile]
[proxy/Makefile]
@@
-294,7
+298,8
@@
AC_CONFIG_FILES(
[wireshark/Makefile]
[init/Makefile]
[keys/Makefile]
[wireshark/Makefile]
[init/Makefile]
[keys/Makefile]
- [mon/Makefile])
+ [mon/Makefile]
+ [t/Makefile t/atlocal])
AC_OUTPUT
dnl ----- That's all, folks -------------------------------------------------
AC_OUTPUT
dnl ----- That's all, folks -------------------------------------------------