Changeset 19585

Timestamp:

Sep 16, 2008, 10:34:52 AM (18 years ago)

Author:

Paul Price

Message:

Libtool was disabled!

Location:

trunk/ppNorm

Files:

• autogen.sh (modified) (1 diff)
• configure.ac (modified) (1 diff)
• src/Makefile.am (modified) (1 diff)

trunk/ppNorm/autogen.sh

@@ -21 +21 @@
 AUTOCONF=autoconf
 
-#($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1 || {
-#        echo
-#        echo "You must have $LIBTOOLIZE installed to compile $PROJECT."
-#        echo "Download the appropriate package for your distribution,"
-#        echo "or get the source tarball at http://ftp.gnu.org/gnu/libtool/"
-#        DIE=1
-#}
+($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1 || {
+        echo
+        echo "You must have $LIBTOOLIZE installed to compile $PROJECT."
+        echo "Download the appropriate package for your distribution,"
+        echo "or get the source tarball at http://ftp.gnu.org/gnu/libtool/"
+        DIE=1
+}
 
 ($ACLOCAL --version) < /dev/null > /dev/null 2>&1 || {

trunk/ppNorm/configure.ac

@@ -14 +14 @@
 AC_PROG_CC_C99
 AC_PROG_INSTALL
-dnl AC_PROG_LIBTOOL
+AC_PROG_LIBTOOL
 AC_SYS_LARGEFILE
-                                                                                
+
 PKG_CHECK_MODULES([PSLIB], [pslib >= 1.0.0])
 PKG_CHECK_MODULES([PSMODULE], [psmodules >= 1.0.0])

trunk/ppNorm/src/Makefile.am

@@ -1 +1 @@
 bin_PROGRAMS = ppNormCalc
 
-ppNormCalc_CFLAGS = $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS)
-ppNormCalc_LDFLAGS = $(PSMODULE_LIBS) $(PSLIB_LIBS)
+ppNormCalc_CFLAGS = $(PPNORM_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS)
+ppNormCalc_LDFLAGS = $(PPNORM_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
 
 ppNormCalc_SOURCES =            \