|
 |
3b3fd0 |
diff -up fltk-1.3.4-1/fltk-config.in.fltk_config fltk-1.3.4-1/fltk-config.in
|
|
|
3b3fd0 |
--- fltk-1.3.4-1/fltk-config.in.fltk_config 2016-01-30 20:49:56.000000000 -0600
|
|
|
3b3fd0 |
+++ fltk-1.3.4-1/fltk-config.in 2017-03-04 12:29:28.910316677 -0600
|
|
|
6d0cd7 |
@@ -44,8 +44,8 @@ CXX="@CXX@"
|
|
|
3b3fd0 |
|
|
|
6d0cd7 |
# flags for C++ compiler:
|
|
|
6d0cd7 |
ARCHFLAGS="@ARCHFLAGS@"
|
|
|
6d0cd7 |
-CFLAGS="@CFLAGS@ @LARGEFILE@ @PTHREAD_FLAGS@"
|
|
|
6d0cd7 |
-CXXFLAGS="@CXXFLAGS@ @LARGEFILE@ @PTHREAD_FLAGS@"
|
|
|
6d0cd7 |
+CFLAGS=""
|
|
|
6d0cd7 |
+CXXFLAGS=""
|
|
|
6d0cd7 |
LDFLAGS="@LDFLAGS@"
|
|
|
6d0cd7 |
LDLIBS="@LIBS@"
|
|
|
6d0cd7 |
OPTIM="@OPTIM@"
|
|
|
6d0cd7 |
@@ -228,7 +228,7 @@ if test "$BINARY_DIR" != ""; then
|
|
|
6d0cd7 |
includes="-I$BINARY_DIR $includes"
|
|
|
6d0cd7 |
fi
|
|
|
3b3fd0 |
|
|
|
6d0cd7 |
-if test "$libdir" != /usr/lib -a "$libdir" != /usr/lib32; then
|
|
|
6d0cd7 |
+if test "$libdir" != /usr/lib -a "$libdir" != /usr/lib32 -a "$libdir" != /usr/lib64; then
|
|
|
6d0cd7 |
libs=-L$libdir
|
|
|
6d0cd7 |
else
|
|
|
6d0cd7 |
libs=
|
|
|
6d0cd7 |
@@ -236,28 +236,28 @@ fi
|
|
|
3b3fd0 |
|
|
|
6d0cd7 |
# Calculate needed libraries
|
|
|
6d0cd7 |
LDSTATIC="$libdir/libfltk.a $LDLIBS"
|
|
|
6d0cd7 |
-LDLIBS="-lfltk$SHAREDSUFFIX $LDLIBS"
|
|
|
6d0cd7 |
+LDLIBS="-lfltk$SHAREDSUFFIX"
|
|
|
3b3fd0 |
|
|
|
6d0cd7 |
if test x$use_forms = xyes; then
|
|
|
3b3fd0 |
LDLIBS="-lfltk_forms$SHAREDSUFFIX $LDLIBS"
|
|
|
6d0cd7 |
LDSTATIC="$libdir/libfltk_forms.a $LDSTATIC"
|
|
|
6d0cd7 |
fi
|
|
|
6d0cd7 |
if test x$use_gl = xyes; then
|
|
|
6d0cd7 |
- LDLIBS="-lfltk_gl$SHAREDSUFFIX @GLLIB@ $LDLIBS"
|
|
|
3b3fd0 |
+ LDLIBS="-lfltk_gl$SHAREDSUFFIX $LDLIBS"
|
|
|
6d0cd7 |
LDSTATIC="$libdir/libfltk_gl.a @GLLIB@ $LDSTATIC"
|
|
|
6d0cd7 |
fi
|
|
|
6d0cd7 |
if test x$use_images = xyes; then
|
|
|
6d0cd7 |
- LDLIBS="-lfltk_images$SHAREDSUFFIX $IMAGELIBS $LDLIBS"
|
|
|
3b3fd0 |
+ LDLIBS="-lfltk_images$SHAREDSUFFIX $LDLIBS"
|
|
|
6d0cd7 |
LDSTATIC="$libdir/libfltk_images.a $STATICIMAGELIBS $LDSTATIC"
|
|
|
6d0cd7 |
fi
|
|
|
3b3fd0 |
|
|
|
6d0cd7 |
if test x$use_cairo = xyes; then
|
|
|
6d0cd7 |
- LDLIBS="-lfltk_cairo$SHAREDSUFFIX $CAIROLIBS $LDLIBS"
|
|
|
3b3fd0 |
+ LDLIBS="-lfltk_cairo$SHAREDSUFFIX $LDLIBS"
|
|
|
6d0cd7 |
LDSTATIC="$libdir/libfltk_cairo.a $CAIROLIBS $LDSTATIC"
|
|
|
6d0cd7 |
fi
|
|
|
3b3fd0 |
|
|
|
6d0cd7 |
-LDLIBS="$DSOLINK $LDFLAGS $libs $LDLIBS"
|
|
|
6d0cd7 |
-LDSTATIC="$LDFLAGS $LDSTATIC"
|
|
|
6d0cd7 |
+LDLIBS="$libs $LDLIBS"
|
|
|
6d0cd7 |
+#LDSTATIC="$LDFLAGS $LDSTATIC"
|
|
|
3b3fd0 |
|
|
|
6d0cd7 |
# Answer to user requests
|
|
|
6d0cd7 |
if test -n "$echo_help"; then
|