mirror of
https://github.com/macports/macports-ports.git
synced 2026-07-12 18:20:25 -07:00
Ryan Schmidt
7ae865f7ef
* update to 5.0.1 * rename configure.in to configure.ac to prepare for automake 1.14 * patch configure.ac to fix problems when using automake 1.13 (https://trac.macports.org/ticket/37593) * patch autogen.sh to not check for presence of svn since we're not using it * patch autogen.sh to fix a comment syntax error which resulted in a spurious error being printed * patch autogen.sh to exit with an error if configuration or compilation of nDPI fails * run autogen.sh as configure.cmd instead of as autoconf.cmd because during the configure phase MacPorts sets environment variables like CC which are needed for nDPI * remove "build.type gnu" because that is the default git-svn-id: https://svn.macports.org/repository/macports/trunk/dports@102753 d073be05-634f-4543-b044-5fe20cf6d1d6
63 lines
1.7 KiB
Diff
63 lines
1.7 KiB
Diff
--- autogen.sh.orig 2012-02-20 04:35:43.000000000 -0600
|
|
+++ autogen.sh 2013-02-07 18:25:43.000000000 -0600
|
|
@@ -202,29 +202,11 @@
|
|
GNU_OR_DIE=0
|
|
}
|
|
|
|
-WGET=`find_command 'wget*'`
|
|
-($WGET --version) < /dev/null > /dev/null 2>&1 ||
|
|
-{
|
|
- echo
|
|
- echo "You must have wget installed to compile $progname."
|
|
- echo "Download the appropriate package for your distribution, or get the"
|
|
- echo "source tarball from ftp://ftp.gnu.org/pub/gnu/wget"
|
|
- GNU_OR_DIE=0
|
|
-}
|
|
|
|
if test "$GNU_OR_DIE" -eq 0; then
|
|
exit 1
|
|
fi
|
|
|
|
-SVN=`find_command 'svn'`
|
|
-($SVN --version) < /dev/null > /dev/null 2>&1 ||
|
|
-{
|
|
- echo
|
|
- echo "You must have svn/subversion installed to compile $progname."
|
|
- echo "Download the appropriate package for your distribution, or get the"
|
|
- echo "source from http://subversion.tigris.org"
|
|
- GNU_OR_DIE=0
|
|
-}
|
|
|
|
if test "$GNU_OR_DIE" -eq 0; then
|
|
exit 1
|
|
@@ -325,9 +307,9 @@
|
|
|
|
if [ ! -f libtool.m4.in ]; then
|
|
echo " Finding libtool.m4.in"
|
|
- if [ -f /usr/local/share/aclocal/libtool.m4 ]; then
|
|
- echo " .... found /usr/local/share/aclocal/libtool.m4"
|
|
- cp /usr/local/share/aclocal/libtool.m4 libtool.m4.in
|
|
+ if [ -f __PREFIX__/share/aclocal/libtool.m4 ]; then
|
|
+ echo " .... found __PREFIX__/share/aclocal/libtool.m4"
|
|
+ cp __PREFIX__/share/aclocal/libtool.m4 libtool.m4.in
|
|
else
|
|
if [ -f /usr/share/aclocal/libtool.m4 ]; then
|
|
echo " .... found /usr/share/aclocal/libtool.m4"
|
|
@@ -444,13 +426,14 @@
|
|
else
|
|
svn co $NDPI_URL
|
|
fi
|
|
+echo
|
|
|
|
-dnl> nDPI compilation
|
|
+# nDPI compilation
|
|
if test -f NDPI_LIB; then
|
|
echo "nDPI already compiled"
|
|
else
|
|
echo "10. Compiling nDPI..."
|
|
- cd nDPI; ./configure --with-pic; make; cd ..
|
|
+ cd nDPI; ./configure --with-pic || exit $?; make || exit $?; cd ..
|
|
fi
|
|
|
|
|