[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-core-devel
Subject:    PATCH: kdeprint/configure.in.in
From:       Jason Stephenson <panda () mis ! net>
Date:       2001-10-13 3:52:32
[Download RAW message or body]

Attached is a patch that fixes a configure problem that I encountered with 
kdelibs on FreeBSD this morning. AC_CHECK_CUPS_VERSION will now use the 
user-defined includes and libs when --with-extra-includes and 
--with-extra-libs are specified to configure. The patch is maybe a little 
overzealous, but I basically lifted the added lines straight out of one of 
the libjpeg macros.

I don't anticipate there being any issues with the patch, but I am posting it 
here rather than just checking it in. Please, try it and let me know what 
criticisms you may have of it. If you want me to check it in, I can. If 
someone else wants to, then that's cool, too.

Oh, the patch is for HEAD.

Cheers,
Jason
["config.patch" (text/x-diff)]

Index: configure.in.in
===================================================================
RCS file: /home/kde/kdelibs/kdeprint/configure.in.in,v
retrieving revision 1.9
diff -u -r1.9 configure.in.in
--- configure.in.in	2001/10/08 15:15:14	1.9
+++ configure.in.in	2001/10/13 03:41:20
@@ -1,7 +1,11 @@
 AC_DEFUN(AC_CHECK_CUPS_VERSION,
 [
 AC_MSG_CHECKING(CUPS version >= $1)
-ac_link='${CC} -o conftest conftest.c -lcups $LIBDL $LIBSOCKET 1>&5'
+ac_save_LIBS="$LIBS"
+LIBS="$all_libraries $USER_LDFLAGS -lcups $LIBDL $LIBSOCKET"
+ac_save_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
+ac_link="${CC} $CFLAGS -o conftest $LIBS conftest.c 1>&5"
 cat > conftest.c <<EOF
 #include <cups/cups.h>
 #include <stdio.h>
@@ -26,6 +30,8 @@
   ac_have_new_cups="no"
 fi
 rm -f conftest
+LIBS="$ac_save_LIBS"
+CFLAGS="$ac_save_CFLAGS"
 AC_MSG_RESULT("$ac_have_new_cups")
 ])
 


[prev in list] [next in list] [prev in thread] [next in thread]