--- deliantra/server/configure.ac 2006/12/11 19:10:58 1.24 +++ deliantra/server/configure.ac 2006/12/11 19:21:12 1.25 @@ -29,43 +29,30 @@ ;; esac - AC_PROG_CPP AM_PROG_LEX AC_PROG_AWK -AC_ARG_ENABLE(dmalloc, [ --enable-dmalloc Use the dmalloc library if available, may prevent plugins from working], - use_dmalloc=yes, use_dmalloc=no) - dnl AC_ARG_WITH(python, [ --with-python=dir Directory to look for python headers/library (default=standard system location) ], PYTHON_HOME="$withval") - dnl check for some other programs AC_PATH_PROG(LATEX, latex) AC_PATH_PROG(GZIP, gzip) -AC_PATH_PROG(GUNZIP, gunzip) +AC_PATH_PROG(BZIP, bzip2) AC_PATH_PROG(TAR, tar) -AC_PATH_PROG(PERL, perl) AC_PATH_PROG(BASENAME, basename) -AC_PATH_PROG(GPERF, gperf) -if test -n "$GZIP" -a -z "$GUNZIP" ; then - echo "Found gzip, but not gunzip - setting GUNZIP to gzip -c"; - GUNZIP="$GZIP -c" -fi; +AC_PATH_PROG(PERL, perl5.8) +AC_PATH_PROG(PERL, perl5) +AC_PATH_PROG(PERL, perl) -if test -z "$COMPRESS" ; then - AC_PATH_PROG(COMPRESS, compress) - AC_PATH_PROG(UNCOMPRESS, uncompress) +AC_PATH_PROG(GPERF, gperf) +if test -z "$GPERF"; then + AC_MSG_ERROR([we need gperf, the GNU perfect hash generator]) fi -AC_PATH_PROG(BZIP, bzip2) -AC_PATH_PROG(BUNZIP, bunzip2) - -if test -n "$BZIP" -a -z "$BUNZIP" ; then - echo "Found bzip2, but not bunzip2 - setting BUNZIP to bzip2 -c"; - BUNZIP="$BZIP -c" -fi; +GUNZIP="$GZIP -c" +BUNZIP="$BZIP -c" if test -z "$COMPRESS" -a -z "$GZIP" -a -z "$BZIP" ; then echo "Unable to find either compress, bzip2, or gzip - hope you don't plan on compressing"; @@ -196,10 +183,6 @@ AC_DEFINE_UNQUOTED(BZIP,"${BZIP}",[Path to the bzip binary]) AC_DEFINE_UNQUOTED(BUNZIP,"${BUNZIP}",[Path to the bunzip binary]) -AC_PATH_PROG(PERL, perl5.8) -AC_PATH_PROG(PERL, perl5) -AC_PATH_PROG(PERL, perl) - AC_MSG_CHECKING(for $PERL suitability) if $PERL -MExtUtils::Embed -e "use v5.8" >/dev/null 2>/dev/null; then