dnl
dnl Author: Thomas E. Dickey 1995-on
dnl
-dnl $Id: configure.in,v 1.523 2011/07/16 21:54:34 tom Exp $
+dnl $Id: configure.in,v 1.527 2011/10/22 18:56:06 tom Exp $
dnl Process this file with autoconf to produce a configure script.
dnl
dnl See http://invisible-island.net/autoconf/ for additional information.
dnl
dnl ---------------------------------------------------------------------------
AC_PREREQ(2.13.20020210)
-AC_REVISION($Revision: 1.523 $)
+AC_REVISION($Revision: 1.527 $)
AC_INIT(ncurses/base/lib_initscr.c)
AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
# if we find pkg-config, check if we should install the ".pc" files.
CF_PKG_CONFIG
+CF_WITH_PKG_CONFIG_LIBDIR
CF_ENABLE_PC_FILES
AC_MSG_CHECKING(if we should assume mixed-case filenames)
TICS_DEP_SUFFIX="${TICS_NAME}${DFT_DEP_SUFFIX}"
TICS_LIB_SUFFIX="${TICS_NAME}${LIB_SUFFIX}"
fi
- TICS_ARGS="-L${LIB_DIR} -l${TICS_LIB_SUFFIX}"
+ TICS_LDFLAGS="-L${LIB_DIR}"
+ TICS_LIBS="-l${TICS_LIB_SUFFIX}"
else
- TICS_ARGS="-L${LIB_DIR} -l${LIB_NAME}${DFT_ARG_SUFFIX}"
+ TICS_LDFLAGS="-L${LIB_DIR}"
+ TICS_LIBS="-l${LIB_NAME}${DFT_ARG_SUFFIX}"
fi
AC_SUBST(TICS_ARG_SUFFIX)
AC_SUBST(TICS_DEP_SUFFIX)
AC_SUBST(TICS_LIB_SUFFIX)
-AC_SUBST(TICS_ARGS)
+AC_SUBST(TICS_LDFLAGS)
+AC_SUBST(TICS_LIBS)
if test "$with_termlib" != no ; then
if test "$DFT_LWR_MODEL" = "libtool"; then
TEST_ARGS="${TEST_DEPS}"
TEST_ARG2="${TEST_DEP2}"
- TINFO_ARGS="-L${LIB_DIR} $TEST_ARGS"
+ TINFO_LDFLAGS="-L${LIB_DIR}"
+ TINFO_LIBS="$TEST_ARGS"
TICS_LIST="$SHLIB_LIST $TEST_ARGS"
SHLIB_LIST="${SHLIB_LIST} $TEST_ARGS"
else
TEST_ARGS="-l${TINFO_ARG_SUFFIX}"
TEST_ARG2="-l${TINFO_ARG_SUFFIX}"
TICS_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
- TINFO_ARGS="-L${LIB_DIR} $TEST_ARGS"
+ TINFO_LDFLAGS="-L${LIB_DIR}"
+ TINFO_LIBS="$TEST_ARGS"
SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
fi
else
TICS_LIST="$SHLIB_LIST"
fi
- TINFO_ARGS="-L${LIB_DIR} -l${LIB_NAME}${DFT_ARG_SUFFIX}"
+ TINFO_LDFLAGS="-L${LIB_DIR}"
+ TINFO_LIBS="-l${LIB_NAME}${DFT_ARG_SUFFIX}"
fi
if test "$DFT_LWR_MODEL" = shared ; then
AC_SUBST(TINFO_ARG_SUFFIX)
AC_SUBST(TINFO_DEP_SUFFIX)
AC_SUBST(TINFO_LIB_SUFFIX)
-AC_SUBST(TINFO_ARGS)
+AC_SUBST(TINFO_LDFLAGS)
+AC_SUBST(TINFO_LIBS)
if test "$with_dlsym" = yes ; then
CF_REMOVE_LIB(TICS_LIST,$TICS_LIST,dl)
fi
# needed for Ada95
-TINFO_ARGS2=`echo "$TINFO_ARGS" | sed -e 's,-L\.\./,-L../../,'`
-AC_SUBST(TINFO_ARGS2)
+TINFO_LDFLAGS2=`echo "$TINFO_LDFLAGS" | sed -e 's,-L\.\./,-L../../,'`
+AC_SUBST(TINFO_LDFLAGS2)
case $DFT_LWR_MODEL in
normal|debug|profile)
CF_SRC_MODULES($modules_to_build)
-if test "$cf_with_ada" != "no" && test "$cf_cv_prog_gnat_correct" != "no"; then
+if test "x$cf_with_ada" = "xyes" && test "x$cf_cv_prog_gnat_correct" = "xyes"; then
SUB_MAKEFILES="$SUB_MAKEFILES Ada95/gen/adacurses${DFT_ARG_SUFFIX}-config:Ada95/gen/adacurses-config.in"
SUB_MAKEFILES="$SUB_MAKEFILES man/adacurses${DFT_ARG_SUFFIX}-config.1:man/MKada_config.in"
fi
fi
CF_LIB_RULES($SRC_SUBDIRS)
-if test "x$cf_with_ada" != xno ; then
+if test "x$cf_with_ada" = "xyes" && test "x$cf_cv_prog_gnat_correct" = "xyes"; then
if test -z "$USE_OLD_MAKERULES" ; then
$AWK -f $srcdir/Ada95/mk-1st.awk <$srcdir/Ada95/src/modules >>Ada95/src/Makefile
fi