Changeset 24244 for branches/cnb_branches/cnb_branch_20090301/psLib/configure.ac

Timestamp:

May 26, 2009, 1:59:32 PM (17 years ago)

Author:

beaumont

Message:

merged with trunk

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• psLib/configure.ac (modified) (3 diffs)

branches/cnb_branches/cnb_branch_20090301/psLib/configure.ac

@@ -6 +6 @@
 
 dnl this enables the building of libtap
-dnl AC_CONFIG_SUBDIRS([test/tap])
+AC_CONFIG_SUBDIRS([test/tap])
+dnl AC_CONFIG_SUBDIRS([test/pstap])
 
 AM_INIT_AUTOMAKE([1.7 foreign dist-bzip2])
@@ -39 +40 @@
     AC_SUBST(PERL,$PERL)
 
-dnl SUBDIR="etc src share test utils" dnl don't include 'swig', as it is optional
-SUBDIR="etc src share utils" dnl don't include 'swig', as it is optional
+SUBDIR="etc src share test utils" dnl don't include 'swig', as it is optional
+dnl SUBDIR="etc src share utils" dnl don't include 'swig', as it is optional
 
 SRCPATH='${top_srcdir}/src'
@@ -340 +341 @@
 LDFLAGS=${TMP_LDFLAGS}
 CPPFLAGS=${TMP_CPPFLAGS}
+
+IPP_VERSION
 
 dnl ------- enable -Werror after all of the probes have run ---------