diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2007-07-26 22:45:43 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2007-07-26 22:45:43 +0000 |
| commit | 355e94dc85c9adaf0ad76a1dc8f5ff960181059c (patch) | |
| tree | 8acddd9c84526d8611c71ee89d299cf5c978084d /config-scripts/cups-compiler.m4 | |
| parent | cc0d019f5e08f870f94b8fee5f264b287fcecc3c (diff) | |
Merge changes from CUPS trunk, r6739.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@361 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'config-scripts/cups-compiler.m4')
| -rw-r--r-- | config-scripts/cups-compiler.m4 | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/config-scripts/cups-compiler.m4 b/config-scripts/cups-compiler.m4 index 93302113f..c89a2a613 100644 --- a/config-scripts/cups-compiler.m4 +++ b/config-scripts/cups-compiler.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-compiler.m4 6687 2007-07-18 19:49:45Z mike $" +dnl "$Id: cups-compiler.m4 6698 2007-07-20 14:15:44Z mike $" dnl dnl Compiler stuff for the Common UNIX Printing System (CUPS). dnl @@ -72,14 +72,19 @@ AC_SUBST(PIEFLAGS) RELROFLAGS="" AC_SUBST(RELROFLAGS) +LIBCUPSORDER="libcups.order" AC_ARG_WITH(libcupsorder, [ --with-libcupsorder libcups secorder file, default=libcups.order], - LIBCUPSORDER="$withval", - LIBCUPSORDER="libcups.order") + if test -f "$withval"; then + LIBCUPSORDER="$withval" + fi) AC_SUBST(LIBCUPSORDER) -AC_ARG_WITH(libcupsimageorder, [ --with-libcupimagesorder libcupsimage secorder file, default=libcups.order], - LIBCUPSIMAGEORDER="$withval", - LIBCUPSIMAGEORDER="libcupsimage.order") +LIBCUPSIMAGEORDER="libcupsimage.order" +AC_ARG_WITH(libcupsimageorder, [ --with-libcupsimagesorder + libcupsimage secorder file, default=libcupsimage.order], + if test -f "$withval"; then + LIBCUPSIMAGEORDER="$withval" + fi) AC_SUBST(LIBCUPSIMAGEORDER) if test -n "$GCC"; then @@ -459,5 +464,5 @@ case $uname in esac dnl -dnl End of "$Id: cups-compiler.m4 6687 2007-07-18 19:49:45Z mike $". +dnl End of "$Id: cups-compiler.m4 6698 2007-07-20 14:15:44Z mike $". dnl |