Changeset 11517

Timestamp:

Jan 31, 2007, 4:21:28 PM (19 years ago)

Author:

jhoblitt

Message:

remove perl module checks (perl scripts are now in ippScripts)
use IPP_STDOPTS macro

Location:

trunk/ippTools

Files:

• configure.ac (modified) (2 diffs)
• src/Makefile.am (modified) (13 diffs)

trunk/ippTools/configure.ac

@@ -7 +7 @@
 AM_CONFIG_HEADER([src/config.h])
 AM_MAINTAINER_MODE
+
+IPP_STDOPTS
 
 AC_LANG(C)
@@ -45 +47 @@
 fi
 
-AC_PROG_PERL_MODULES(
-  [IPC::Cmd], ,
-  [AC_MSG_ERROR(perl module IPC::Cmd is required)]
-)
-
-AC_PROG_PERL_MODULES(
-  [PS::IPP::Metadata::Config], ,
-  [AC_MSG_ERROR(perl module PS::IPP::Metadata::Config is required)]
-)
-
-AC_PROG_PERL_MODULES(
-  [PS::IPP::Metadata::List], ,
-  [AC_MSG_ERROR(perl module PS::IPP::Metadata::List is required)]
-)
-
-AC_PROG_PERL_MODULES(
-  [PS::IPP::Metadata::Stats], ,
-  [AC_MSG_ERROR(perl module PS::IPP::Metadata::Stats is required)]
-)
-
-AC_PROG_PERL_MODULES(
-  [Cache::File], ,
-  [AC_MSG_ERROR(perl module Cache::File is required)]
-)
-
-pxtools_CFLAGS="-Wall -Werror -std=c99"
-AC_SUBST([pxtools_CFLAGS])
+CFLAGS="${CFLAGS=} -Wall -Werror -std=c99"
 
 AC_CONFIG_FILES([

trunk/ippTools/src/Makefile.am

@@ -31 +31 @@
 
 lib_LTLIBRARIES = libpxtools.la
-libpxtools_la_CFLAGS    = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) $(pxtools_CFLAGS)
+libpxtools_la_CFLAGS    = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
 libpxtools_la_LIBS      = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS)
 libpxtools_la_LDFLAGS   = -release $(PACKAGE_VERSION)
@@ -45 +45 @@
 AM_CPPFLAGS = -I$(top_srcdir)/src$
 
-pztool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) $(pxtools_CFLAGS)
+pztool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) 
 pztool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
 pztool_SOURCES = \
@@ -51 +51 @@
     pztoolConfig.c
 
-p0tool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) $(pxtools_CFLAGS)
+p0tool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
 p0tool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
 p0tool_SOURCES = \
@@ -57 +57 @@
     p0toolConfig.c
 
-p1tool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) $(pxtools_CFLAGS)
+p1tool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) 
 p1tool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
 p1tool_SOURCES = \
@@ -63 +63 @@
     p1toolConfig.c
 
-p2tool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) $(pxtools_CFLAGS)
+p2tool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
 p2tool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
 p2tool_SOURCES = \
@@ -69 +69 @@
     p2toolConfig.c
 
-p3tool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) $(pxtools_CFLAGS)
+p3tool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
 p3tool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
 p3tool_SOURCES = \
@@ -75 +75 @@
     p3toolConfig.c
 
-p4tool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) $(pxtools_CFLAGS)
+p4tool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
 p4tool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
 p4tool_SOURCES = \
@@ -81 +81 @@
     p4toolConfig.c
 
-pxadmin_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) $(pxtools_CFLAGS)
+pxadmin_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
 pxadmin_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
 pxadmin_SOURCES = \
@@ -87 +87 @@
     pxadminConfig.c
 
-pzgetexp_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) $(pxtools_CFLAGS)
+pzgetexp_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
 pzgetexp_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
 pzgetexp_SOURCES = \
@@ -93 +93 @@
     pzgetexpConfig.c
 
-pzgetimfiles_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) $(pxtools_CFLAGS)
+pzgetimfiles_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
 pzgetimfiles_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
 pzgetimfiles_SOURCES = \
@@ -99 +99 @@
     pzgetimfilesConfig.c
 
-dettool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) $(pxtools_CFLAGS)
+dettool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
 dettool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
 dettool_SOURCES = \
@@ -105 +105 @@
     dettoolConfig.c
 
-detselect_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) $(pxtools_CFLAGS)
+detselect_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
 detselect_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
 detselect_SOURCES = \
@@ -111 +111 @@
     detselectConfig.c
 
-pxinject_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) $(pxtools_CFLAGS)
+pxinject_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
 pxinject_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
 pxinject_SOURCES = \