improve autoconf
This commit is contained in:
@@ -13,7 +13,7 @@ PACKAGE=prosqlite
|
||||
DOC=prosqlite
|
||||
include ../Makefile.defs
|
||||
|
||||
CFLAGS+= @PROSQLITE_CFLAGS@ -I.
|
||||
CPPFLAGS+= @PROSQLITE_CPPFLAGS@ -I.
|
||||
LDSOFLAGS+= @PROSQLITE_LDFLAGS@
|
||||
|
||||
LIBS=@LIBS@
|
||||
|
@@ -11,7 +11,7 @@ AC_SUBST(PKG_PROSQLITE)
|
||||
|
||||
AC_SUBST(PROSQLITE_TARGETS)
|
||||
AC_SUBST(PROSQLITE_PLTARGETS)
|
||||
AC_SUBST(PROSQLITE_CFLAGS)
|
||||
AC_SUBST(PROSQLITE_CPPFLAGS)
|
||||
AC_SUBST(PROSQLITE_LDFLAGS)
|
||||
AC_SUBST(PROSQLITE_LIBS)
|
||||
|
||||
@@ -22,7 +22,7 @@ m4_include([../ac_swi_c.m4])
|
||||
yap_cv_prosqlite=yes
|
||||
|
||||
yap_cv_prosqlite=yes
|
||||
AC_ARG_WITH(sqlite,
|
||||
AC_ARG_WITH(prosqlite,
|
||||
[ --with-prosqlite(=location) interface to sqlite],
|
||||
if test "$withval" = yes; then
|
||||
PROSQLITE_DIR=/usr
|
||||
@@ -36,15 +36,15 @@ AC_ARG_WITH(sqlite,
|
||||
havelib=no
|
||||
|
||||
if test $yap_cv_prosqlite = yes; then
|
||||
OCFLAGS="${CFLAGS}"
|
||||
OCPPFLAGS="${CPPFLAGS}"
|
||||
OCPPFLAGS="${CPPFLAGS}"
|
||||
OCIFLAGS="${CIFLAGS}"
|
||||
OLDFLAGS="${LDFLAGS}"
|
||||
|
||||
if test ! -z "$PROSQLITE_DIR"; then
|
||||
PROSQLITE_CFLAGS="-I${PROSQLITE_DIR}/include"
|
||||
PROSQLITE_CPPFLAGS="-I${PROSQLITE_DIR}/include"
|
||||
PROSQLITE_LDFLAGS="-L${PROSQLITE_DIR}/lib"
|
||||
CFLAGS="-I${PROSQLITE_DIR}/include ${CFLAGS}"
|
||||
CPPFLAGS="-I${PROSQLITE_DIR}/include ${CPPFLAGS}"
|
||||
CPPFLAGS="-I${PROSQLITE_DIR}/include ${CPPFLAGS}"
|
||||
CIFLAGS="-I${PROSQLITE_DIR}/include ${CIFLAGS}"
|
||||
LDFLAGS="-L${PROSQLITE_DIR}/lib ${LDFLAGS}"
|
||||
@@ -56,7 +56,7 @@ if test $yap_cv_prosqlite = yes; then
|
||||
|
||||
AC_CHECK_HEADERS(sqlite3.h, [], [])
|
||||
|
||||
CFLAGS="${OCFLAGS}"
|
||||
CPPFLAGS="${OCPPFLAGS}"
|
||||
CPPFLAGS="${OCPPFLAGS}"
|
||||
CIFLAGS="${OCIFLAGS}"
|
||||
LDFLAGS="${OLDFLAGS}"
|
||||
|
Reference in New Issue
Block a user