Add new libcupslite component that builds a libcups without driver/PPD support.

3 files changed, 44 insertions, 15 deletions

diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
index df1b1549a..9ab84cb48 100644
--- a/config-scripts/cups-common.m4
+++ b/config-scripts/cups-common.m4
@@ -434,9 +434,12 @@ COMPONENTS="all"
 AC_ARG_WITH(components, [  --with-components       set components to build:
 			    - "all" (default) builds everything
 			    - "core" builds libcups and ipptool
-			    - "libcups" builds just libcups],
+			    - "libcups" builds just libcups
+			    - "libcupslite" builds just libcups without driver support],
 	COMPONENTS="$withval")
 
+cupsimagebase="cupsimage"
+LIBCUPSOBJS="\$(COREOBJS) \$(DRIVEROBJS)"
 case "$COMPONENTS" in
 	all)
 		BUILDDIRS="test filter backend berkeley cgi-bin monitor notifier ppdc scheduler systemv conf data desktop locale man doc examples templates"
@@ -448,6 +451,13 @@ case "$COMPONENTS" in
 
 	libcups)
 		BUILDDIRS="locale"
+		cupsimagebase=""
+		;;
+
+	libcupslite)
+		BUILDDIRS="locale"
+		cupsimagebase=""
+		LIBCUPSOBJS="\$(COREOBJS)"
 		;;
 
 	*)
@@ -456,3 +466,4 @@ case "$COMPONENTS" in
 esac
 
 AC_SUBST(BUILDDIRS)
+AC_SUBST(LIBCUPSOBJS)
diff --git a/config-scripts/cups-defaults.m4 b/config-scripts/cups-defaults.m4
index 43f034d7b..b3d96ef0a 100644
--- a/config-scripts/cups-defaults.m4
+++ b/config-scripts/cups-defaults.m4
@@ -41,9 +41,6 @@ AC_ARG_WITH(bundlelang, [  --with-bundlelang       set localization bundle base
 	else
 		cups_bundlelang="English"
 	fi])
-else
-	cups_bundlelang=""
-fi
 
 if test "x$cups_bundlelang" != x -a "x$CUPS_BUNDLEDIR" != x; then
 	CUPS_RESOURCEDIR="$CUPS_BUNDLEDIR/Resources/$cups_bundlelang.lproj"
diff --git a/config-scripts/cups-sharedlibs.m4 b/config-scripts/cups-sharedlibs.m4
index 690817f0d..80e1ee2f5 100644
--- a/config-scripts/cups-sharedlibs.m4
+++ b/config-scripts/cups-sharedlibs.m4
@@ -15,27 +15,34 @@ AC_ARG_ENABLE(shared, [  --disable-shared        do not create shared libraries]
 
 cupsbase="cups"
 LIBCUPSBASE="lib$cupsbase"
+LIBCUPSIMAGE=""
 LIBCUPSSTATIC="lib$cupsbase.a"
 
 if test x$enable_shared != xno; then
 	case "$host_os_name" in
 		sunos*)
 			LIBCUPS="lib$cupsbase.so.2"
-			LIBCUPSIMAGE="libcupsimage.so.2"
+			if test "x$cupsimagebase" != x; then
+				LIBCUPSIMAGE="lib$cupsimagebase.so.2"
+			fi
 			DSO="\$(CC)"
 			DSOXX="\$(CXX)"
 			DSOFLAGS="$DSOFLAGS -Wl,-h\`basename \$@\` -G \$(OPTIM)"
 			;;
 		linux* | gnu* | *bsd*)
 			LIBCUPS="lib$cupsbase.so.2"
-			LIBCUPSIMAGE="libcupsimage.so.2"
+			if test "x$cupsimagebase" != x; then
+				LIBCUPSIMAGE="lib$cupsimagebase.so.2"
+			fi
 			DSO="\$(CC)"
 			DSOXX="\$(CXX)"
 			DSOFLAGS="$DSOFLAGS -Wl,-soname,\`basename \$@\` -shared \$(OPTIM)"
 			;;
 		darwin*)
 			LIBCUPS="lib$cupsbase.2.dylib"
-			LIBCUPSIMAGE="libcupsimage.2.dylib"
+			if test "x$cupsimagebase" != x; then
+				LIBCUPSIMAGE="lib$cupsimagebase.2.dylib"
+			fi
 			DSO="\$(CC)"
 			DSOXX="\$(CXX)"
 			DSOFLAGS="$DSOFLAGS -dynamiclib -single_module -lc"
@@ -44,7 +51,9 @@ if test x$enable_shared != xno; then
 			echo "Warning: shared libraries may not be supported.  Trying -shared"
 			echo "         option with compiler."
 			LIBCUPS="lib$cupsbase.so.2"
-			LIBCUPSIMAGE="libcupsimage.so.2"
+			if test "x$cupsimagebase" != x; then
+				LIBCUPSIMAGE="lib$cupsimagebase.so.2"
+			fi
 			DSO="\$(CC)"
 			DSOXX="\$(CXX)"
 			DSOFLAGS="$DSOFLAGS -Wl,-soname,\`basename \$@\` -shared \$(OPTIM)"
@@ -53,7 +62,9 @@ if test x$enable_shared != xno; then
 else
 	PICFLAG=0
 	LIBCUPS="lib$cupsbase.a"
-	LIBCUPSIMAGE="libcupsimage.a"
+	if test "x$cupsimagebase" != x; then
+		LIBCUPSIMAGE="lib$cupsimagebase.a"
+	fi
 	DSO=":"
 	DSOXX=":"
 fi
@@ -68,16 +79,26 @@ AC_SUBST(LIBCUPSSTATIC)
 
 if test x$enable_shared = xno; then
 	LINKCUPS="../cups/lib$cupsbase.a"
-	LINKCUPSIMAGE="../cups/libcupsimage.a"
-
 	EXTLINKCUPS="-lcups"
-	EXTLINKCUPSIMAGE="-lcupsimage"
+
+	if test "x$cupsimagebase" != x; then
+		LINKCUPSIMAGE="../cups/lib$cupsimagebase.a"
+		EXTLINKCUPSIMAGE="-l$cupsimagebase"
+	else
+		LINKCUPSIMAGE=""
+		EXTLINKCUPSIMAGE=""
+	fi
 else
 	LINKCUPS="-l${cupsbase}"
-	LINKCUPSIMAGE="-lcupsimage"
-
 	EXTLINKCUPS="-lcups"
-	EXTLINKCUPSIMAGE="-lcupsimage"
+
+	if test "x$cupsimagebase" != x; then
+		LINKCUPSIMAGE="-l$cupsimagebase"
+		EXTLINKCUPSIMAGE="-l$cupsimagebase"
+	else
+		LINKCUPSIMAGE=""
+		EXTLINKCUPSIMAGE=""
+	fi
 fi
 
 AC_SUBST(EXTLINKCUPS)