Imported Upstream version 3.0.2-20060530upstream/3.0.2-20060530

1 files changed, 65 insertions, 7 deletions

diff --git a/configure b/configure
index a8d9598..e80afb2 100755
--- a/configure
+++ b/configure
@@ -767,6 +767,16 @@ Optional Features:
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-file-converter-check  check whether a file converter is installed default=yes
 
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-file-converter=a2ps|enscript|mpage
+			Default: auto
+  --with-echo=(path to GNU compatible echo command)
+			Default: echo
+  --with-execpath=(path to various filters)
+			Default: ${prefix}/bin:/usr/local/bin:/usr/bin:/bin
+
 _ACEOF
 fi
 
@@ -1757,13 +1767,49 @@ echo "${ECHO_T}no" >&6
 fi
 
 
+
+# Check whether --with-file-converter or --without-file-converter was given.
+if test "${with_file_converter+set}" = set; then
+  withval="$with_file_converter"
+  FILECONVERTER="$withval"
+else
+  FILECONVERTER=""
+fi;
+echo "$as_me:$LINENO: result: file-converter: $FILECONVERTER" >&5
+echo "${ECHO_T}file-converter: $FILECONVERTER" >&6
+
+
 if test "${NOCONVERTERCHECK}" = "" -a "${A2PS}" = "" -a "${ENSCRIPT}" = "" -a "${MPAGE}" = "" -a "${TEXTTOPS}" = "" ; then
 	{ { echo "$as_me:$LINENO: error: cannot find a2ps, enscript, mpage, or CUPS' texttops.  You need to have at least one installed" >&5
 echo "$as_me: error: cannot find a2ps, enscript, mpage, or CUPS' texttops.  You need to have at least one installed" >&2;}
    { (exit 1); exit 1; }; };
 fi
 
-ac_config_files="$ac_config_files Makefile makeMan foomatic-gswrapper foomatic-rip beh"
+
+# Check whether --with-echo or --without-echo was given.
+if test "${with_echo+set}" = set; then
+  withval="$with_echo"
+  ECHO="$withval"
+else
+  ECHO="echo"
+fi;
+echo "$as_me:$LINENO: result: GNU Compatible Echo: $ECHO" >&5
+echo "${ECHO_T}GNU Compatible Echo: $ECHO" >&6
+
+
+
+# Check whether --with-execpath or --without-execpath was given.
+if test "${with_execpath+set}" = set; then
+  withval="$with_execpath"
+  EXECPATH="$withval"
+else
+  EXECPATH="${prefix}/bin:/usr/local/bin:/usr/bin:/bin"
+fi;
+echo "$as_me:$LINENO: result: Execpath: $EXECPATH" >&5
+echo "${ECHO_T}Execpath: $EXECPATH" >&6
+
+
+ac_config_files="$ac_config_files Makefile beh foomatic-rip foomatic-gswrapper foomatic-rip.1 foomatic-gswrapper.1"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -2262,10 +2308,11 @@ do
   case "$ac_config_target" in
   # Handling of arguments.
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  "makeMan" ) CONFIG_FILES="$CONFIG_FILES makeMan" ;;
-  "foomatic-gswrapper" ) CONFIG_FILES="$CONFIG_FILES foomatic-gswrapper" ;;
-  "foomatic-rip" ) CONFIG_FILES="$CONFIG_FILES foomatic-rip" ;;
   "beh" ) CONFIG_FILES="$CONFIG_FILES beh" ;;
+  "foomatic-rip" ) CONFIG_FILES="$CONFIG_FILES foomatic-rip" ;;
+  "foomatic-gswrapper" ) CONFIG_FILES="$CONFIG_FILES foomatic-gswrapper" ;;
+  "foomatic-rip.1" ) CONFIG_FILES="$CONFIG_FILES foomatic-rip.1" ;;
+  "foomatic-gswrapper.1" ) CONFIG_FILES="$CONFIG_FILES foomatic-gswrapper.1" ;;
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
@@ -2363,6 +2410,9 @@ s,@A2PS@,$A2PS,;t t
 s,@ENSCRIPT@,$ENSCRIPT,;t t
 s,@MPAGE@,$MPAGE,;t t
 s,@TEXTTOPS@,$TEXTTOPS,;t t
+s,@FILECONVERTER@,$FILECONVERTER,;t t
+s,@ECHO@,$ECHO,;t t
+s,@EXECPATH@,$EXECPATH,;t t
 CEOF
 
 _ACEOF
@@ -2591,6 +2641,14 @@ if test "$no_create" != yes; then
 fi
 
 
-echo "Finished configuring."
-echo "Type 'make' to build the package"
-echo "then 'make install' to install it."
+cat <<EOF
+Finished configuring.
+Type 'make' to build the package
+Type 'make install' to install the base foomatic bits and links appropriate for
+				CUPS and PPR to use foomatic
+Type 'make install-main' to install the base foomatic bits.
+Type 'make install-{cups|ppr}' to install the base foomatic bits and links
+				appropriate for CUPS or PPR to use foomatic
+Type 'make tests' to run some basic sanity tests (in place)
+EOF
+