Index: cups-defaults.m4
===================================================================
--- cups-defaults.m4	(revision 5591)
+++ cups-defaults.m4	(working copy)
@@ -30,7 +30,7 @@
 AC_SUBST(LANGUAGES)
 
 dnl Default ConfigFilePerm
-AC_ARG_WITH(config_perm, [  --with-config-file-perm set default ConfigFilePerm value, default=0640],
+AC_ARG_WITH(config_file_perm, [  --with-config-file-perm set default ConfigFilePerm value, default=0640],
 	CUPS_CONFIG_FILE_PERM="$withval",
 	if test "x$uname" = xDarwin; then
 		CUPS_CONFIG_FILE_PERM="644"
@@ -41,7 +41,7 @@
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_CONFIG_FILE_PERM, 0$CUPS_CONFIG_FILE_PERM)
 
 dnl Default LogFilePerm
-AC_ARG_WITH(log_perm, [  --with-log-file-perm    set default LogFilePerm value, default=0644],
+AC_ARG_WITH(log_file_perm, [  --with-log-file-perm    set default LogFilePerm value, default=0644],
 	CUPS_LOG_FILE_PERM="$withval",
 	CUPS_LOG_FILE_PERM="644")
 AC_SUBST(CUPS_LOG_FILE_PERM)
@@ -59,7 +59,7 @@
 AC_SUBST(CUPS_BROWSING)
 
 dnl Default BrowseLocalProtocols
-AC_ARG_WITH(browse_local, [  --with-local-protocols  set default BrowseLocalProtocols, default="CUPS"],
+AC_ARG_WITH(local_protocols, [  --with-local-protocols  set default BrowseLocalProtocols, default="CUPS"],
 	CUPS_BROWSE_LOCAL_PROTOCOLS="$withval",
 	CUPS_BROWSE_LOCAL_PROTOCOLS="CUPS")
 AC_SUBST(CUPS_BROWSE_LOCAL_PROTOCOLS)
@@ -67,7 +67,7 @@
 	"$CUPS_BROWSE_LOCAL_PROTOCOLS")
 
 dnl Default BrowseRemoteProtocols
-AC_ARG_WITH(browse_remote, [  --with-remote-protocols set default BrowseRemoteProtocols, default="CUPS"],
+AC_ARG_WITH(remote_protocols, [  --with-remote-protocols set default BrowseRemoteProtocols, default="CUPS"],
 	CUPS_BROWSE_REMOTE_PROTOCOLS="$withval",
 	CUPS_BROWSE_REMOTE_PROTOCOLS="CUPS")
 AC_SUBST(CUPS_BROWSE_REMOTE_PROTOCOLS)
@@ -130,7 +130,7 @@
 AC_SUBST(CUPS_USE_NETWORK_DEFAULT)
 
 dnl Determine the correct username and group for this OS...
-AC_ARG_WITH(cups-user, [  --with-cups-user        set default user for CUPS],
+AC_ARG_WITH(cups_user, [  --with-cups-user        set default user for CUPS],
 	CUPS_USER="$withval",
 	AC_MSG_CHECKING(for default print user)
 	if test -f /etc/passwd; then
@@ -152,7 +152,7 @@
 		AC_MSG_RESULT(no password file, using "$CUPS_USER")
 	fi)
 
-AC_ARG_WITH(cups-group, [  --with-cups-group       set default group for CUPS],
+AC_ARG_WITH(cups_group, [  --with-cups-group       set default group for CUPS],
 	CUPS_GROUP="$withval",
 	AC_MSG_CHECKING(for default print group)
 	if test -f /etc/group; then
@@ -175,7 +175,7 @@
 		AC_MSG_RESULT(no group file, using "$CUPS_GROUP")
 	fi)
 
-AC_ARG_WITH(system-groups, [  --with-system-groups    set default system groups for CUPS],
+AC_ARG_WITH(system_groups, [  --with-system-groups    set default system groups for CUPS],
 	CUPS_SYSTEM_GROUPS="$withval",
 	if test x$uname = xDarwin; then
 		GROUP_LIST="admin"
@@ -221,13 +221,13 @@
 dnl Default printcap file...
 AC_ARG_WITH(printcap, [  --with-printcap         set default printcap file],
 	default_printcap="$withval",
-	default_printcap="/etc/printcap")
+	default_printcap="default")
 
 if test x$enable_printcap != xno -a x$default_printcap != xno; then
-	if test "x$default_printcap" = "x/etc/printcap" -a "$uname" = "Darwin" -a $uversion -ge 90; then
+	if test "x$default_printcap" = "xdefault" -a "$uname" = "Darwin" -a $uversion -ge 90; then
 		CUPS_DEFAULT_PRINTCAP=""
 	else
-		CUPS_DEFAULT_PRINTCAP="$default_printcap"
+		CUPS_DEFAULT_PRINTCAP="/etc/printcap"
 	fi
 else
 	CUPS_DEFAULT_PRINTCAP=""
Index: cups-compiler.m4
===================================================================
--- cups-compiler.m4	(revision 5591)
+++ cups-compiler.m4	(working copy)
@@ -34,7 +34,7 @@
 	fi])
 
 dnl Setup general architecture flags...
-AC_ARG_WITH(archflags, [  --with-arch="flags"     set default architecture flags ])
+AC_ARG_WITH(archflags, [  --with-archflags="flags"     set default architecture flags ])
 
 if test -z "$with_archflags"; then
 	ARCHFLAGS=""
@@ -46,7 +46,7 @@
 
 dnl Setup support for separate 32/64-bit library generation...
 AC_ARG_ENABLE(32bit, [  --enable-32bit          generate 32-bit libraries on 32/64-bit systems, default=no])
-AC_ARG_WITH(arch32flags, [  --with-arch32="flags"   specifies 32-bit architecture flags])
+AC_ARG_WITH(arch32flags, [  --with-arch32flags="flags"   specifies 32-bit architecture flags])
 
 ARCH32FLAGS=""
 INSTALL32=""
@@ -63,7 +63,7 @@
 AC_SUBST(UNINSTALL32)
 
 AC_ARG_ENABLE(64bit, [  --enable-64bit          generate 64-bit libraries on 32/64-bit systems, default=no])
-AC_ARG_WITH(arch64flags, [  --with-arch64="flags"   specifies 64-bit architecture flags])
+AC_ARG_WITH(arch64flags, [  --with-arch64flags="flags"   specifies 64-bit architecture flags])
 
 ARCH64FLAGS=""
 INSTALL64=""
