Author: engelsman
Date: 2010-11-13 08:47:47 -0800 (Sat, 13 Nov 2010)
New Revision: 7825
Log:
added --prefix and --includedir flags to fltk-config (STR #2137)
also fixed typo in fltk-config.cmake.in (STR #2443)
Modified:
branches/branch-1.3/fltk-config.cmake.in
branches/branch-1.3/fltk-config.in
Modified: branches/branch-1.3/fltk-config.cmake.in
===================================================================
--- branches/branch-1.3/fltk-config.cmake.in 2010-11-13 09:01:45 UTC (rev
7824)
+++ branches/branch-1.3/fltk-config.cmake.in 2010-11-13 16:47:47 UTC (rev
7825)
@@ -4,7 +4,7 @@
#
# FLTK configuration utility.
#
-# Copyright 2000-2009 by Bill Spitzak and others.
+# Copyright 2000-2010 by Bill Spitzak and others.
# Original version Copyright 2000 by James Dean Palmer
# Adapted by Vincent Penne and Michael Sweet
#
@@ -41,7 +41,7 @@
exec_prefix=${prefix}
exec_prefix_set=no
bind...@prefix_bin@
-included...@cprefix_include@
+included...@prefix_include@
libd...@prefix_lib@
srcdir=.
@@ -123,6 +123,8 @@
[--ldstaticflags] return flags to link against static FLTK library
even if there are DSOs installed
[--libs] return FLTK libraries full path for dependencies
+ [--prefix] return FLTK install time --prefix directory
+ [--includedir] return FLTK install time include directory
Options to compile and link an application:
[-g] compile the program with debugging information
@@ -197,6 +199,12 @@
--libs)
echo_libs=yes
;;
+ --prefix)
+ echo_prefix=yes
+ ;;
+ --includedir)
+ echo_includedir=yes
+ ;;
-g)
debug=-g
;;
@@ -385,6 +393,14 @@
echo $USELIBS
fi
+if test "$echo_prefix" = "yes"; then
+ echo $prefix
+fi
+
+if test "$echo_includedir" = "yes"; then
+ echo $includedir
+fi
+
#
# End of "$Id: fltk-config.in 6614 2009-01-01 16:11:32Z matt $".
#
Modified: branches/branch-1.3/fltk-config.in
===================================================================
--- branches/branch-1.3/fltk-config.in 2010-11-13 09:01:45 UTC (rev 7824)
+++ branches/branch-1.3/fltk-config.in 2010-11-13 16:47:47 UTC (rev 7825)
@@ -4,7 +4,7 @@
#
# FLTK configuration utility.
#
-# Copyright 2000-2009 by Bill Spitzak and others.
+# Copyright 2000-2010 by Bill Spitzak and others.
# Original version Copyright 2000 by James Dean Palmer
# Adapted by Vincent Penne and Michael Sweet
#
@@ -123,6 +123,8 @@
[--ldstaticflags] return flags to link against static FLTK library
even if there are DSOs installed
[--libs] return FLTK libraries full path for dependencies
+ [--prefix] return FLTK install time --prefix directory
+ [--includedir] return FLTK install time include directory
Options to compile and link an application:
[-g] compile the program with debugging information
@@ -197,6 +199,12 @@
--libs)
echo_libs=yes
;;
+ --prefix)
+ echo_prefix=yes
+ ;;
+ --includedir)
+ echo_includedir=yes
+ ;;
-g)
debug=-g
;;
@@ -385,6 +393,14 @@
echo $USELIBS
fi
+if test "$echo_prefix" = "yes"; then
+ echo $prefix
+fi
+
+if test "$echo_includedir" = "yes"; then
+ echo $includedir
+fi
+
#
# End of "$Id$".
#
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
