summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorMatthias Melcher <fltk@matthiasm.com>2008-12-29 19:45:46 +0000
committerMatthias Melcher <fltk@matthiasm.com>2008-12-29 19:45:46 +0000
commit6b3f61e3ffab1e3770a819aceecb06decf13f9da (patch)
tree36720c0b169a6049bbc3ed80aefa85affa3074b1 /configure.in
parent7180c24f3c32491971f984196607ff65a345a914 (diff)
In the configuration setp, LIBNAME (which contains the local path of the library as seen from the src directory) was used wrong. I added LIBBASENAME, the true library name without the path, and replaced LIBNAME wherever it was used wrongly.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6611 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in14
1 files changed, 13 insertions, 1 deletions
diff --git a/configure.in b/configure.in
index b5ece35f9..07a503e5d 100644
--- a/configure.in
+++ b/configure.in
@@ -99,6 +99,12 @@ GLLIBNAME="../lib/libfltk_gl.a"
IMGLIBNAME="../lib/libfltk_images.a"
CAIROLIBNAME="../lib/libfltk_cairo.a"
+LIBBASENAME="libfltk.a"
+FLLIBBASENAME="libfltk_forms.a"
+GLLIBBASENAME="libfltk_gl.a"
+IMGLIBBASENAME="libfltk_images.a"
+CAIROLIBBASENAME="libfltk_cairo.a"
+
AC_SUBST(FLLIBNAME)
AC_SUBST(GLDEMOS)
AC_SUBST(GLLIBNAME)
@@ -111,6 +117,12 @@ AC_SUBST(LINKFLTKFORMS)
AC_SUBST(LINKFLTKGL)
AC_SUBST(LINKFLTKIMG)
+AC_SUBST(LIBBASENAME)
+AC_SUBST(FLLIBBASENAME)
+AC_SUBST(GLLIBBASENAME)
+AC_SUBST(IMGLIBBASENAME)
+AC_SUBST(CAIROLIBBASENAME)
+
dnl Handle compile-time options...
AC_ARG_ENABLE(debug, [ --enable-debug turn on debugging [default=no]])
if test x$enable_debug = xyes; then
@@ -128,7 +140,7 @@ LINKFLTKCAIRO=""
FLTKCAIROOPTION=""
CAIROLIBS=""
-AC_ARG_ENABLE(cairo,[ --enable-cairoext use fltk code instrumentation for cairo extended use (default=no)])
+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)