forked from Lainports/freebsd-ports
3eb7289d1c
- LICENSE was changed from GPLv2 to a Public Domain license - UI options have been reconfigured so that if the user installs a GUI (GTK2, GTK3, or QT5), mp-5 is also usable in the console via the NCURSES or ANSI options - mpsl and supporting data are no longer installed, but rather compiled into the mp-5 binary - Add pkg-message to explain the GUI color scheme change and how to revert to the previous color scheme if so desired
49 lines
1.8 KiB
Bash
49 lines
1.8 KiB
Bash
--- mpdm/config.sh.orig 2019-02-11 11:53:55 UTC
|
|
+++ mpdm/config.sh
|
|
@@ -194,8 +194,8 @@ echo -n "Testing for regular expressions... "
|
|
|
|
if [ "$WITH_PCRE" = 1 ] ; then
|
|
# try first the pcre library
|
|
- TMP_CFLAGS="-I/usr/local/include"
|
|
- TMP_LDFLAGS="-L/usr/local/lib -lpcre -lpcreposix"
|
|
+ TMP_CFLAGS="-I$LOCALBASE/include"
|
|
+ TMP_LDFLAGS="-L$LOCALBASE/lib -lpcre -lpcreposix"
|
|
echo "#include <pcreposix.h>" > .tmp.c
|
|
echo "int main(void) { regex_t r; regmatch_t m; regcomp(&r,\".*\",REG_EXTENDED|REG_ICASE); return 0; }" >> .tmp.c
|
|
|
|
@@ -373,13 +373,15 @@ else
|
|
echo "#define CONFOPT_GETTEXT 1" >> config.h
|
|
else
|
|
# try now with -lintl
|
|
- TMP_LDFLAGS="-lintl"
|
|
+ TMP_CFLAGS="-I$LOCALBASE/include"
|
|
+ TMP_LDFLAGS="-L$LOCALBASE/lib -lintl"
|
|
|
|
- $CC .tmp.c $TMP_LDFLAGS -o .tmp.o 2>> .config.log
|
|
+ $CC $TMP_CFLAGS .tmp.c $TMP_LDFLAGS -o .tmp.o 2>> .config.log
|
|
|
|
if [ $? = 0 ] ; then
|
|
echo "OK (libintl needed)"
|
|
echo "#define CONFOPT_GETTEXT 1" >> config.h
|
|
+ echo "$TMP_CFLAGS" >> config.cflags
|
|
echo "$TMP_LDFLAGS" >> config.ldflags
|
|
else
|
|
echo "No"
|
|
@@ -406,13 +408,15 @@ else
|
|
echo "#define CONFOPT_ICONV 1" >> config.h
|
|
else
|
|
# try now with -liconv
|
|
- TMP_LDFLAGS="-liconv"
|
|
+ TMP_CFLAGS="-I$ICONV_PREFIX/include"
|
|
+ TMP_LDFLAGS="-L$ICONV_PREFIX/lib $ICONV_LIB"
|
|
|
|
- $CC .tmp.c $TMP_LDFLAGS -o .tmp.o 2>> .config.log
|
|
+ $CC $TMP_CFLAGS .tmp.c $TMP_LDFLAGS -o .tmp.o 2>> .config.log
|
|
|
|
if [ $? = 0 ] ; then
|
|
echo "OK (libiconv needed)"
|
|
echo "#define CONFOPT_ICONV 1" >> config.h
|
|
+ echo "$TMP_CFLAGS" >> config.cflags
|
|
echo "$TMP_LDFLAGS" >> config.ldflags
|
|
else
|
|
echo "No"
|