Author: fabien
Date: 2008-10-25 07:53:03 -0700 (Sat, 25 Oct 2008)
New Revision: 6484
Log:
Fixed enable-shared would not work when cairo is not available. Added a new
flag name FLTKCAIROOPTION for conditional -l cairo lib include.
Modified:
branches/branch-1.3/configure.in
Modified: branches/branch-1.3/configure.in
===================================================================
--- branches/branch-1.3/configure.in 2008-10-22 07:01:02 UTC (rev 6483)
+++ branches/branch-1.3/configure.in 2008-10-25 14:53:03 UTC (rev 6484)
@@ -121,6 +121,46 @@
AC_ARG_ENABLE(gl, [ --enable-gl turn on OpenGL support
[default=yes]])
+dnl Check for Cairo library unless disabled...
+CAIRODIR=""
+CAIROFLAGS=""
+LINKFLTKCAIRO=""
+FLTKCAIROOPTION=""
+CairolibsCAIROLIBS=""
+
+AC_ARG_ENABLE(cairo,[ --enable-cairoext use fltk code
instrumentation for cairo extended use (default=no)])
+if test x$enable_cairoext = xyes; then
+ AC_DEFINE(USE_CAIRO)
+ AC_DEFINE(HAVE_CAIRO)
+ dnl FIXME This part should be fixed so configure do not depend on
+ dnl we do not rely on pkg-config .
+ CAIRODIR="cairo"
+ CAIROFLAGS="`pkg-config --cflags cairo`"
+ CAIROLIBS="-lcairo -lpixman-1"
+ CXXFLAGS="$CAIROFLAGS $CXXFLAGS"
+ LINKFLTKCAIRO="../lib/libfltk_cairo.a"
+ FLTKCAIROOPTION="-lfltk_cairo$SHAREDSUFFIX"
+ LIBS="$CAIROLIBS $LINKFLTKCAIRO $LIBS"
+fi
+
+AC_ARG_ENABLE(cairo,[ --enable-cairo use lib Cairo (default=no)])
+if test x$enable_cairo = xyes; then
+ AC_DEFINE(HAVE_CAIRO)
+ dnl FIXME This part should be fixed so configure do not depend on
+ dnl we do not rely on pkg-config .
+ CAIRODIR="cairo"
+ CAIROFLAGS="`pkg-config --cflags cairo`"
+ CAIROLIBS="-lcairo -lpixman-1"
+ CXXFLAGS="$CAIROFLAGS $CXXFLAGS"
+ LINKFLTKCAIRO="../lib/libfltk_cairo.a"
+ FLTKCAIROOPTION="-lfltk_cairo$SHAREDSUFFIX"
+fi
+AC_SUBST(CAIRODIR)
+AC_SUBST(CAIROFLAGS)
+AC_SUBST(CAIROLIBS)
+AC_SUBST(LINKFLTKCAIRO)
+AC_SUBST(FLTKCAIROOPTION)
+
AC_ARG_ENABLE(shared, [ --enable-shared turn on shared libraries
[default=no]])
if test x$enable_shared = xyes; then
PICFLAG=1
@@ -237,7 +277,7 @@
;;
esac
- LINKSHARED="-L../src -lfltk_cairo$SHAREDSUFFIX -lfltk_images$SHAREDSUFFIX
-lfltk_forms$SHAREDSUFFIX -lfltk$SHAREDSUFFIX"
+ LINKSHARED="-L../src $(FLTKCAIROOPTION) -lfltk_images$SHAREDSUFFIX
-lfltk_forms$SHAREDSUFFIX -lfltk$SHAREDSUFFIX"
else
DSOCOMMAND="echo"
DSOLINK=""
@@ -249,7 +289,7 @@
PICFLAG=0
SHAREDSUFFIX=""
FLUID="fluid"
- LINKSHARED="../lib/libfltk_cairo.a ../lib/libfltk_images.a
../lib/libfltk_forms.a ../lib/libfltk.a"
+ LINKSHARED="$(LINKFLTKCAIRO) ../lib/libfltk_images.a
../lib/libfltk_forms.a ../lib/libfltk.a"
fi
AC_SUBST(DSOCOMMAND)
@@ -571,43 +611,6 @@
dnl See if we need a .exe extension on executables...
AC_EXEEXT
-dnl Check for Cairo library unless disabled...
-CAIRODIR=""
-CAIROFLAGS=""
-LINKFLTKCAIRO=""
-CAIROLIBS=""
-
-AC_ARG_ENABLE(cairo,[ --enable-cairoext use fltk code
instrumentation for cairo extended use (default=no)])
-if test x$enable_cairoext = xyes; then
- AC_DEFINE(USE_CAIRO)
- AC_DEFINE(HAVE_CAIRO)
- dnl FIXME This part should be fixed so configure do not depend on
- dnl we do not rely on pkg-config .
- CAIRODIR="cairo"
- CAIROFLAGS="`pkg-config --cflags cairo`"
- CAIROLIBS="-lcairo -lpixman-1"
- CXXFLAGS="$CAIROFLAGS $CXXFLAGS"
- LINKFLTKCAIRO="../lib/libfltk_cairo.a"
- LIBS="$CAIROLIBS $LINKFLTKCAIRO $LIBS"
-fi
-
-dnl Check for Cairo library unless disabled...
-AC_ARG_ENABLE(cairo,[ --enable-cairo use lib Cairo (default=no)])
-if test x$enable_cairo = xyes; then
- AC_DEFINE(HAVE_CAIRO)
- dnl FIXME This part should be fixed so configure do not depend on
- dnl we do not rely on pkg-config .
- CAIRODIR="cairo"
- CAIROFLAGS="`pkg-config --cflags cairo`"
- CAIROLIBS="-lcairo -lpixman-1"
- CXXFLAGS="$CAIROFLAGS $CXXFLAGS"
- LINKFLTKCAIRO="../lib/libfltk_cairo.a"
-fi
-AC_SUBST(CAIRODIR)
-AC_SUBST(CAIROFLAGS)
-AC_SUBST(CAIROLIBS)
-AC_SUBST(LINKFLTKCAIRO)
-
dnl Check for pthreads for multi-threaded apps...
have_pthread=no
PTHREAD_FLAGS=""
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
