forked from Lainports/opnsense-ports
93 lines
3.4 KiB
Text
93 lines
3.4 KiB
Text
--- configure.orig 2018-03-21 08:49:04 UTC
|
|
+++ configure
|
|
@@ -5100,7 +5100,7 @@ if test "${enable_threadsafe+set}" = set; then :
|
|
fi
|
|
|
|
if test x$enable_threadsafe = xyes ; then
|
|
- CFLAGS="-DGS_THREADSAFE"
|
|
+ CFLAGS="$CFLAGS -DGS_THREADSAFE"
|
|
fi
|
|
|
|
|
|
@@ -5762,7 +5762,6 @@ if ${ac_cv_lib_dl_dlopen+:} false; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-ldl $LIBS"
|
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
@@ -5795,7 +5794,7 @@ $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
|
|
if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
|
|
ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
|
|
if test "x$ac_cv_header_dlfcn_h" = xyes; then :
|
|
- GCFLAGS="$GCFLAGS -DHAVE_LIBDL=1";LIBS="-ldl $LIBS"
|
|
+ GCFLAGS="$GCFLAGS -DHAVE_LIBDL=1";
|
|
fi
|
|
|
|
|
|
@@ -9950,42 +9949,42 @@ if test x$enable_threadsafe = xyes; then
|
|
|
|
for ntsdev in $NTS_DEVS ; do
|
|
NTS_EXCLUDES="$(echo \"$P_DEVS0{@:0}\" | grep -o $ntsdev) $NTS_EXCLUDES"
|
|
- P_DEVS0=`echo $P_DEVS0 | sed "s/\b$ntsdev\b//g"`
|
|
+ P_DEVS0=`echo $P_DEVS0 | sed "s/[[:<:]]$ntsdev[[:>:]]//g"`
|
|
done
|
|
|
|
for ntsdev in $NTS_DEVS ; do
|
|
NTS_EXCLUDES="$(echo \"$F_DEVS0{@:0}\" | grep -o $ntsdev) $NTS_EXCLUDES"
|
|
- F_DEVS0=`echo $F_DEVS0 | sed "s/\b$ntsdev\b//g"`
|
|
+ F_DEVS0=`echo $F_DEVS0 | sed "s/[[:<:]]$ntsdev[[:>:]]//g"`
|
|
done
|
|
|
|
for ntsdev in $NTS_DEVS ; do
|
|
NTS_EXCLUDES="$(echo \"$CUPS_DEVS0{@:0}\" | grep -o $ntsdev) $NTS_EXCLUDES"
|
|
- CUPS_DEVS0=`echo $CUPS_DEVS0 | sed "s/\b$ntsdev\b//g"`
|
|
+ CUPS_DEVS0=`echo $CUPS_DEVS0 | sed "s/[[:<:]]$ntsdev[[:>:]]//g"`
|
|
done
|
|
|
|
for ntsdev in $NTS_DEVS ; do
|
|
NTS_EXCLUDES="$(echo \"$XPS_DEVS0{@:0}\" | grep -o $ntsdev) $NTS_EXCLUDES"
|
|
- XPS_DEVS0=`echo $XPS_DEVS0 | sed "s/\b$ntsdev\b//g"`
|
|
+ XPS_DEVS0=`echo $XPS_DEVS0 | sed "s/[[:<:]]$ntsdev[[:>:]]//g"`
|
|
done
|
|
|
|
for ntsdev in $NTS_DEVS ; do
|
|
NTS_EXCLUDES="$(echo \"$IJS_DEVS0{@:0}\" | grep -o $ntsdev) $NTS_EXCLUDES"
|
|
- IJS_DEVS0=`echo $IJS_DEVS0 | sed "s/\b$ntsdev\b//g"`
|
|
+ IJS_DEVS0=`echo $IJS_DEVS0 | sed "s/[[:<:]]$ntsdev[[:>:]]//g"`
|
|
done
|
|
|
|
for ntsdev in $NTS_DEVS ; do
|
|
NTS_EXCLUDES="$(echo \"$PNG_DEVS0{@:0}\" | grep -o $ntsdev) $NTS_EXCLUDES"
|
|
- PNG_DEVS0=`echo $PNG_DEVS0 | sed "s/\b$ntsdev\b//g"`
|
|
+ PNG_DEVS0=`echo $PNG_DEVS0 | sed "s/[[:<:]]$ntsdev[[:>:]]//g"`
|
|
done
|
|
|
|
for ntsdev in $NTS_DEVS ; do
|
|
NTS_EXCLUDES="$(echo \"$X11_DEVS0{@:0}\" | grep -o $ntsdev) $NTS_EXCLUDES"
|
|
- X11_DEVS0=`echo $X11_DEVS0 | sed "s/\b$ntsdev\b//g"`
|
|
+ X11_DEVS0=`echo $X11_DEVS0 | sed "s/[[:<:]]$ntsdev[[:>:]]//g"`
|
|
done
|
|
|
|
for ntsdev in $NTS_DEVS ; do
|
|
NTS_EXCLUDES="$(echo \"$JBIG2_DEVS{@:0}\" | grep -o $ntsdev) $NTS_EXCLUDES"
|
|
- JBIG2_DEVS=`echo $JBIG2_DEVS | sed "s/\b$ntsdev\b//g"`
|
|
+ JBIG2_DEVS=`echo $JBIG2_DEVS | sed "s/[[:<:]]$ntsdev[[:>:]]//g"`
|
|
done
|
|
|
|
NTS_EXCLUDES=`echo "$NTS_EXCLUDES" | tr " " "\n" | sort | uniq | tr "\n" " "`
|
|
@@ -10145,7 +10144,12 @@ if test "${enable_dynamic+set}" = set; then :
|
|
DBG_CFLAGS="$DYNAMIC_CFLAGS $DBG_CFLAGS"
|
|
;;
|
|
*BSD)
|
|
- DYNAMIC_DEVS="\$(GLOBJDIR)/X11.so"
|
|
+ INSTALL_SHARED="install-shared"
|
|
+ if test "x$X_DEVS" != x; then
|
|
+ DYNAMIC_DEVS="\$(GLOBJDIR)/X11.so"
|
|
+ else
|
|
+ DYNAMIC_DEVS=""
|
|
+ fi
|
|
DYNAMIC_FLAGS="-DGS_DEVS_SHARED -DGS_DEVS_SHARED_DIR=\\\"\$(gssharedir)\\\""
|
|
X11_DEVS=""
|
|
OPT_CFLAGS="$DYNAMIC_CFLAGS $OPT_CFLAGS"
|