diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2009-04-20 15:05:56 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2009-04-20 16:24:02 +0300 |
commit | 3a6373d888021388473bd96c000a8fdab8aedaa5 (patch) | |
tree | acff526d947280ced0912c49af1308031e672158 /configure.ac | |
parent | df8c51d2db6f5d16b97ae2f2b62bd625e5a96833 (diff) | |
download | wydawca-3a6373d888021388473bd96c000a8fdab8aedaa5.tar.gz wydawca-3a6373d888021388473bd96c000a8fdab8aedaa5.tar.bz2 |
Switch to the Grecs submodule.
* gconf: Remove
* Makefile.am (ACLOCAL_AMFLAGS): Add -I grecs/am.
(SUBDIRS): Replace gconf with grecs
(make-ChangeLog): Remove spurious rule.
* bootstrap.conf: Init submodules.
* configure.ac: Call GRECS_SETUP
(AC_CONFIG_FILES): Add grecs/Makefile, grecs/src/Makefile.
* src/wydawca.h: Include grecs.h
* src/Makefile.am (LDADD,INCLUDES): Refer to grecs.
* tests/Makefile.am: Likewise.
* src/cmdline.opt, src/config.c,
src/diskio.c, src/tcpwrap.c, src/wydawca.c: Use grecs.
* README-hacking: Update
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 46 |
1 files changed, 4 insertions, 42 deletions
diff --git a/configure.ac b/configure.ac index 604ccc4..48e1252 100644 --- a/configure.ac +++ b/configure.ac @@ -107,47 +107,8 @@ if test "$status_tcpwrap" = yes; then AC_DEFINE_UNQUOTED([WITH_LIBWRAP],1,[Defined if compiling with libwrap]) fi -# ********************** -# Preprocessor -# ********************** -AC_ARG_WITH([preprocessor], - AC_HELP_STRING([--without-preprocessor], - [do not use external preprocessor]), - [ -case "${withval}" in -yes) use_ext_pp=yes ;; -no) use_ext_pp=no ;; -*) AC_MSG_ERROR(bad value ${withval} for --with-preprocessor) ;; -esac],[use_ext_pp=yes]) - -if test $use_ext_pp != no; then - # Check for default preprocessor - AC_ARG_VAR([DEFAULT_PREPROCESSOR], - [Set default preprocessor name]) - if test -z "$DEFAULT_PREPROCESSOR" ; then - DEFAULT_PREPROCESSOR="m4 -s" - fi - - save_PATH=$PATH - PREPROC_OPTIONS=`echo $DEFAULT_PREPROCESSOR | sed -n 's/[[^ ]][[^ ]]* //p'` - case "$DEFAULT_PREPROCESSOR" in - /*) PATH=`expr $DEFAULT_PREPROCESSOR : '\(.*\)/.*'`:$PATH - DEFAULT_PREPROCESSOR=`expr $DEFAULT_PREPROCESSOR : '.*/\(.*\)'`;; - esac - AC_PATH_PROG(PPBIN, $DEFAULT_PREPROCESSOR) - DEFAULT_PREPROCESSOR=$PPBIN - if test -n "$DEFAULT_PREPROCESSOR"; then - DEFAULT_PREPROCESSOR="$DEFAULT_PREPROCESSOR $PREPROC_OPTIONS" - case $PPBIN in - *m4) AC_SUBST(PP_SETUP_FILE,'pp-setup');; # Install default pp-setup - esac - fi - PATH=$save_PATH - DEFAULT_PREPROCESSOR="\\\"$DEFAULT_PREPROCESSOR\\\"" -else - DEFAULT_PREPROCESSOR=NULL -fi - +# Grecs subsystem +GRECS_SETUP AH_BOTTOM([ #if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7) @@ -172,7 +133,8 @@ fi AC_CONFIG_FILES([Makefile doc/Makefile gnu/Makefile - gconf/Makefile + grecs/Makefile + grecs/src/Makefile src/Makefile etc/Makefile]) |