Changeset 11335 for trunk/ippTools/configure.ac

Timestamp:

Jan 26, 2007, 4:31:50 PM (19 years ago)

Author:

jhoblitt

Message:

rollback "cleanup use of pkg-config discovered packages"

File:

• trunk/ippTools/configure.ac (modified) (2 diffs)

trunk/ippTools/configure.ac

@@ -14 +14 @@
 AC_PROG_LIBTOOL
 
-PKG_CHECK_MODULES([DEPS],
-    [pslib >= 0.12.99
-    psmodules >= 0.12.0
-    ippdb >= 0.0.78]) 
+PKG_CHECK_MODULES([PSLIB], [pslib >= 0.12.99]) 
+PKG_CHECK_MODULES([PSMODULES], [psmodules >= 0.12.0]) 
+PKG_CHECK_MODULES([IPPDB], [ippdb >= 0.0.78]) 
 
-PXTOOLS_CFLAGS="${DEPS_CFLAGS=}"
-PXTOOLS_LIBS="${DEPS_LIBS=}" 
+PXTOOLS_CFLAGS="${PSLIB_CFLAGS=} ${PSMODULES_CFLAGS=} ${IPPDB_CFLAGS=}"
+PXTOOLS_LIBS="${PSLIB_LIBS=} ${PSMODULES_LIBS=} ${IPPDB_LIBS=}"
+AC_SUBST(PXTOOLS_CFLAGS,[$PXTOOLS_CFLAGS])
+AC_SUBST(PXTOOLS_LIBS,[$PXTOOLS_LIBS])
 
 dnl check for PSDB support
 TMP_CFLAGS=${CFLAGS}
-CFLAGS="${CFLAGS=} ${PXTOOLS_CFLAGS}"
+CFLAGS="${CFLAGS=} ${PSLIB_CFLAGS}"
 
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
@@ -69 +70 @@
 )
 
-CFLAGS="${CFLAGS} -Wall -Werror -std=c99"
-
-AC_SUBST(PXTOOLS_CFLAGS, [$PXTOOLS_CFLAGS])
-AC_SUBST(PXTOOLS_LIBS, [$PXTOOLS_LIBS])
+pxtools_CFLAGS="-Wall -Werror -std=c99"
+AC_SUBST([pxtools_CFLAGS])
 
 AC_CONFIG_FILES([