Changeset 3858

Timestamp:

May 5, 2005, 3:07:33 PM (21 years ago)

Author:

desonia

Message:

Bug #387 -- changes to autotools setup.

Location:

trunk/psModules

Files:

• Makefile.cvs (modified) (1 diff)
• autogen.sh (added)
• config.guess (deleted)
• config.sub (deleted)
• configure.ac (modified) (2 diffs)
• depcomp (deleted)
• install-sh (deleted)
• missing (deleted)
• mkinstalldirs (deleted)

trunk/psModules/Makefile.cvs

@@ -2 +2 @@
 
 all:
-        if [ "`which glibtoolize`" != "" ] ; then glibtoolize --force ; else libtoolize --force ; fi
-        aclocal
-        autoheader
-        automake
-        autoconf
+        if [ "`which glibtoolize 2> /dev/null`" != "" ] ; then glibtoolize --force ; else libtoolize --force ; fi
+        aclocal --force
+        autoheader --force
+        automake --add-missing --force
+        autoconf --force
 

trunk/psModules/configure.ac

@@ -1 @@
-AC_INIT([psmodule],[0.5.1],[http://www.pan-starrs.org/bugzilla])
+AC_PREREQ(2.59)
 
-AM_CONFIG_HEADER(src/config.h)
-AM_INIT_AUTOMAKE(psmodule, 0.5.1)
+AC_INIT([psmodule],[0.5.1],[http://pan-starrs.ifa.hawaii.edu/bugzilla])
+AC_CONFIG_SRCDIR([psmodule.pc.in])
+
+AM_INIT_AUTOMAKE([1.6 foreign dist-bzip2])
+AM_CONFIG_HEADER([src/config.h])
+AM_MAINTAINER_MODE
 
 AC_LANG(C)
@@ -47 +51 @@
 LDFLAGS="${LDFLAGS=} ${PSLIB_LIBS}"
 
-dnl Check the libraries to see if they exist, etc.
-AC_CHECK_LIB(pslib,main,,AC_MSG_ERROR(psLib library required))
-
 CFLAGS="${CFLAGS=} -Wall -Werror"
 
-AC_CONFIG_FILES([Makefile])
-AC_CONFIG_FILES([src/Makefile])
-AC_CONFIG_FILES([test/Makefile])
-AC_CONFIG_FILES([Doxyfile])
-AC_CONFIG_FILES([psmodule-config])
-AC_CONFIG_FILES([psmodule.pc])
+AC_CONFIG_FILES([
+  Makefile
+  src/Makefile
+  test/Makefile
+  Doxyfile
+  psmodule-config
+  psmodule.pc
+])
 
 AC_OUTPUT