2f787ea8df
- -devel: Requires: pkgconfig(gl) pkgconfig(glu) - cleaner DSOFLAGS - fltk-config imposes internal build flags on the user (#1350069)
107 lines
3.4 KiB
Diff
107 lines
3.4 KiB
Diff
diff -up fltk-1.3.3/fltk-config.cmake.in.fltk_config fltk-1.3.3/fltk-config.cmake.in
|
|
--- fltk-1.3.3/fltk-config.cmake.in.fltk_config 2013-04-06 11:15:17.000000000 -0500
|
|
+++ fltk-1.3.3/fltk-config.cmake.in 2016-06-26 18:34:24.369828419 -0500
|
|
@@ -223,7 +223,7 @@ else
|
|
includes=
|
|
fi
|
|
|
|
-if test "$libdir" != /usr/lib -a "$libdir" != /usr/lib32; then
|
|
+if test "$libdir" != /usr/lib -a "$libdir" != /usr/lib32 -a "$libdir" != /usr/lib64; then
|
|
libs=-L$libdir
|
|
else
|
|
libs=
|
|
@@ -231,28 +231,28 @@ fi
|
|
|
|
# Calculate needed libraries
|
|
LDSTATIC="$libdir/libfltk.a $LDLIBS"
|
|
-LDLIBS="-lfltk$SHAREDSUFFIX $LDLIBS"
|
|
+LDLIBS="-lfltk$SHAREDSUFFIX"
|
|
|
|
if test x$use_forms = xyes; then
|
|
- LDLIBS="-lfltk_forms$SHAREDSUFFIX $LDLIBS"
|
|
+ LDLIBS="-lfltk_forms$SHAREDSUFFIX"
|
|
LDSTATIC="$libdir/libfltk_forms.a $LDSTATIC"
|
|
fi
|
|
if test x$use_gl = xyes; then
|
|
- LDLIBS="-lfltk_gl$SHAREDSUFFIX @GLLIB@ $LDLIBS"
|
|
+ LDLIBS="-lfltk_gl$SHAREDSUFFIX"
|
|
LDSTATIC="$libdir/libfltk_gl.a @GLLIB@ $LDSTATIC"
|
|
fi
|
|
if test x$use_images = xyes; then
|
|
- LDLIBS="-lfltk_images$SHAREDSUFFIX $IMAGELIBS $LDLIBS"
|
|
+ LDLIBS="-lfltk_images$SHAREDSUFFIX"
|
|
LDSTATIC="$libdir/libfltk_images.a $STATICIMAGELIBS $LDSTATIC"
|
|
fi
|
|
|
|
if test x$use_cairo = xyes; then
|
|
- LDLIBS="-lfltk_cairo$SHAREDSUFFIX $CAIROLIBS $LDLIBS"
|
|
+ LDLIBS="-lfltk_cairo$SHAREDSUFFIX"
|
|
LDSTATIC="$libdir/libfltk_cairo.a $CAIROLIBS $LDSTATIC"
|
|
fi
|
|
|
|
-LDLIBS="$DSOLINK $LDFLAGS $libs $LDLIBS"
|
|
-LDSTATIC="$LDFLAGS $LDSTATIC"
|
|
+LDLIBS="$libs $LDLIBS"
|
|
+#LDSTATIC="$LDFLAGS $LDSTATIC"
|
|
|
|
# Answer to user requests
|
|
if test -n "$echo_help"; then
|
|
diff -up fltk-1.3.3/fltk-config.in.fltk_config fltk-1.3.3/fltk-config.in
|
|
--- fltk-1.3.3/fltk-config.in.fltk_config 2013-04-05 10:28:43.000000000 -0500
|
|
+++ fltk-1.3.3/fltk-config.in 2016-06-26 18:35:37.891323957 -0500
|
|
@@ -42,8 +42,8 @@ CXX="@CXX@"
|
|
|
|
# flags for C++ compiler:
|
|
ARCHFLAGS="@ARCHFLAGS@"
|
|
-CFLAGS="@CFLAGS@ @LARGEFILE@ @PTHREAD_FLAGS@"
|
|
-CXXFLAGS="@CXXFLAGS@ @LARGEFILE@ @PTHREAD_FLAGS@"
|
|
+CFLAGS="@LARGEFILE@ @PTHREAD_FLAGS@"
|
|
+CXXFLAGS="@LARGEFILE@ @PTHREAD_FLAGS@"
|
|
LDFLAGS="@LDFLAGS@"
|
|
LDLIBS="@LIBS@"
|
|
OPTIM="@OPTIM@"
|
|
@@ -223,7 +223,7 @@ else
|
|
includes=
|
|
fi
|
|
|
|
-if test "$libdir" != /usr/lib -a "$libdir" != /usr/lib32; then
|
|
+if test "$libdir" != /usr/lib -a "$libdir" != /usr/lib32 -a "$libdir" != /usr/lib64; then
|
|
libs=-L$libdir
|
|
else
|
|
libs=
|
|
@@ -231,28 +231,28 @@ fi
|
|
|
|
# Calculate needed libraries
|
|
LDSTATIC="$libdir/libfltk.a $LDLIBS"
|
|
-LDLIBS="-lfltk$SHAREDSUFFIX $LDLIBS"
|
|
+LDLIBS="-lfltk$SHAREDSUFFIX"
|
|
|
|
if test x$use_forms = xyes; then
|
|
LDLIBS="-lfltk_forms$SHAREDSUFFIX $LDLIBS"
|
|
LDSTATIC="$libdir/libfltk_forms.a $LDSTATIC"
|
|
fi
|
|
if test x$use_gl = xyes; then
|
|
- LDLIBS="-lfltk_gl$SHAREDSUFFIX @GLLIB@ $LDLIBS"
|
|
+ LDLIBS="-lfltk_gl$SHAREDSUFFIX $LDLIBS"
|
|
LDSTATIC="$libdir/libfltk_gl.a @GLLIB@ $LDSTATIC"
|
|
fi
|
|
if test x$use_images = xyes; then
|
|
- LDLIBS="-lfltk_images$SHAREDSUFFIX $IMAGELIBS $LDLIBS"
|
|
+ LDLIBS="-lfltk_images$SHAREDSUFFIX $LDLIBS"
|
|
LDSTATIC="$libdir/libfltk_images.a $STATICIMAGELIBS $LDSTATIC"
|
|
fi
|
|
|
|
if test x$use_cairo = xyes; then
|
|
- LDLIBS="-lfltk_cairo$SHAREDSUFFIX $CAIROLIBS $LDLIBS"
|
|
+ LDLIBS="-lfltk_cairo$SHAREDSUFFIX $LDLIBS"
|
|
LDSTATIC="$libdir/libfltk_cairo.a $CAIROLIBS $LDSTATIC"
|
|
fi
|
|
|
|
-LDLIBS="$DSOLINK $LDFLAGS $libs $LDLIBS"
|
|
-LDSTATIC="$LDFLAGS $LDSTATIC"
|
|
+LDLIBS="$libs $LDLIBS"
|
|
+#LDSTATIC="$LDFLAGS $LDSTATIC"
|
|
|
|
# Answer to user requests
|
|
if test -n "$echo_help"; then
|