--- rpl/configure.ac 2012/01/17 13:12:03 1.13 +++ rpl/configure.ac 2012/01/18 11:03:45 1.18 @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([rpl],[4.1.5]) +AC_INIT([rpl],[4.1.6]) AC_CANONICAL_TARGET AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(silent-rules) @@ -350,8 +350,10 @@ AC_ARG_ENABLE(vim, [ --enable-vim provide the vim support [[default=guessed]]], [ if test "$enableval" = "no"; then VIM_SUPPORT=no + DEBVIM= else VIM_SUPPORT=yes + DEBVIM=", vim" fi], VIM_SUPPORT=guessed) @@ -451,7 +453,7 @@ if test ! -d "$srcdir"/tools/$NCURSES; t (cd "$srcdir/tools" && tar -xf -) (cd "$srcdir/tools/"$NCURSES && \ for i in ../$NCURSES*.sh.gz; - do gunzip $i; + do TMP=$i; gunzip -c $i > ${TMP%.*}; done; for i in ../$NCURSES*.sh; do chmod 775 $i && ./$i; @@ -655,14 +657,18 @@ if test "$VIM_SUPPORT" = guessed; then Download at http://www.vim.org/ ]) VIM_SUPPORT="-UVIM_SUPPORT" + DEBVIM= else VIM_SUPPORT="-DVIM_SUPPORT" + DEBVIM=", vim" fi else if test "$VIM_SUPPORT" = no; then VIM_SUPPORT="-UVIM_SUPPORT" + DEBVIM= else VIM_SUPPORT="-DVIM_SUPPORT" + DEBVIM=", vim" fi fi @@ -789,6 +795,7 @@ fi if test "$MYSQL_SUPPORT" = "-DMYSQL_SUPPORT"; then MYSQL_LIB=no + if test $MYSQL_LIB = no; then AC_MSG_CHECKING(for libmysql libraries in $libMySQLlib) saved_LIBS="$LIBS" @@ -812,9 +819,13 @@ if test "$MYSQL_SUPPORT" = "-DMYSQL_SUPP fi fi +DEBMYSQL= + if test "$MYSQL_SUPPORT" != "-DMYSQL_SUPPORT"; then libMySQLinc= libMySQLlib= +else + DEBMYSQL=", libmysqlclient18" fi AC_SUBST(MYSQL_SUPPORT) @@ -958,9 +969,13 @@ if test "$POSTGRESQL_SUPPORT" = "-DPOSTG fi fi +DEBPQ= + if test "$POSTGRESQL_SUPPORT" != "-DPOSTGRESQL_SUPPORT"; then libPgSQLinc= libPgSQLlib= +else + DEBPQ=", libpq5" fi AC_SUBST(POSTGRESQL_SUPPORT) @@ -1335,6 +1350,10 @@ AC_SUBST(FFLAGS) AC_SUBST(FCFLAGS) AC_SUBST(LDFLAGS) +AC_SUBST(DEBPQ) +AC_SUBST(DEBMYSQL) +AC_SUBST(DEBVIM) + if test $RECURSIVE = yes; then AC_CONFIG_SUBDIRS(tools/$NCURSES) AC_CONFIG_SUBDIRS(tools/$READLINE)