rename configure.in => configure.ac
authorPierre-Marc Fournier <pierre-marc.fournier@polymtl.ca>
Wed, 12 Aug 2009 02:32:25 +0000 (22:32 -0400)
committerPierre-Marc Fournier <pierre-marc.fournier@polymtl.ca>
Wed, 12 Aug 2009 02:32:25 +0000 (22:32 -0400)
autogen.sh
configure.ac [new file with mode: 0644]
configure.in [deleted file]

index c630e6b042e09606e7852ec43d778e97c7d01e16..cc7edfd82906c5c55a2e1b66b421e967039e3ff3 100755 (executable)
@@ -14,7 +14,7 @@ if [ -n "$GNOME2_DIR" ]; then
        export LD_LIBRARY_PATH
 fi
 
-(test -f $srcdir/configure.in) || {
+(test -f $srcdir/configure.ac) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
     echo " top-level package directory"
     exit 1
@@ -28,7 +28,7 @@ fi
   DIE=1
 }
 
-(grep "^AC_PROG_INTLTOOL" $srcdir/configure.in >/dev/null) && {
+(grep "^AC_PROG_INTLTOOL" $srcdir/configure.ac >/dev/null) && {
   (intltoolize --version) < /dev/null > /dev/null 2>&1 || {
     echo 
     echo "**Error**: You must have \`intltool' installed."
@@ -38,7 +38,7 @@ fi
   }
 }
 
-(grep "^AM_PROG_XML_I18N_TOOLS" $srcdir/configure.in >/dev/null) && {
+(grep "^AM_PROG_XML_I18N_TOOLS" $srcdir/configure.ac >/dev/null) && {
   (xml-i18n-toolize --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "**Error**: You must have \`xml-i18n-toolize' installed."
@@ -48,7 +48,7 @@ fi
   }
 }
 
-(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
+(grep "^AM_PROG_LIBTOOL" $srcdir/configure.ac >/dev/null) && {
   (libtool --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "**Error**: You must have \`libtool' installed."
@@ -57,8 +57,8 @@ fi
   }
 }
 
-(grep "^AM_GLIB_GNU_GETTEXT" $srcdir/configure.in >/dev/null) && {
-  (grep "sed.*POTFILES" $srcdir/configure.in) > /dev/null || \
+(grep "^AM_GLIB_GNU_GETTEXT" $srcdir/configure.ac >/dev/null) && {
+  (grep "sed.*POTFILES" $srcdir/configure.ac) > /dev/null || \
   (glib-gettextize --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "**Error**: You must have \`glib' installed."
@@ -101,7 +101,7 @@ xlc )
   am_opt=--include-deps;;
 esac
 
-for coin in `find $srcdir -path $srcdir/CVS -prune -o -name configure.in -print`
+for coin in `find $srcdir -path $srcdir/CVS -prune -o -name configure.ac -print`
 do 
   dr=`dirname $coin`
   if test -f $dr/NO-AUTO-GEN; then
@@ -112,7 +112,7 @@ do
 
       aclocalinclude="$ACLOCAL_FLAGS"
 
-      if grep "^AM_GLIB_GNU_GETTEXT" configure.in >/dev/null; then
+      if grep "^AM_GLIB_GNU_GETTEXT" configure.ac >/dev/null; then
        echo "Creating $dr/aclocal.m4 ..."
        test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
        echo "Running glib-gettextize...  Ignore non-fatal messages."
@@ -120,15 +120,15 @@ do
        echo "Making $dr/aclocal.m4 writable ..."
        test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
       fi
-      if grep "^AC_PROG_INTLTOOL" configure.in >/dev/null; then
+      if grep "^AC_PROG_INTLTOOL" configure.ac >/dev/null; then
         echo "Running intltoolize..."
        intltoolize --copy --force --automake
       fi
-      if grep "^AM_PROG_XML_I18N_TOOLS" configure.in >/dev/null; then
+      if grep "^AM_PROG_XML_I18N_TOOLS" configure.ac >/dev/null; then
         echo "Running xml-i18n-toolize..."
        xml-i18n-toolize --copy --force --automake
       fi
-      if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
+      if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then
        if test -z "$NO_LIBTOOLIZE" ; then 
          echo "Running libtoolize..."
          libtoolize --force --copy
@@ -136,7 +136,7 @@ do
       fi
       echo "Running aclocal $aclocalinclude ..."
       aclocal $aclocalinclude
-      if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
+      if grep "^AM_CONFIG_HEADER" configure.ac >/dev/null; then
        echo "Running autoheader..."
        autoheader
       fi
diff --git a/configure.ac b/configure.ac
new file mode 100644 (file)
index 0000000..67da0ca
--- /dev/null
@@ -0,0 +1,151 @@
+# This file is part of the Linux Trace Toolkit viewer
+# Copyright (C) 2003-2004 Mathieu Desnoyers
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License Version 2 as
+# published by the Free Software Foundation;
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+# MA 02111-1307, USA.
+
+
+
+#                                               -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+AC_PREREQ(2.57)
+AC_INIT(FULL-PACKAGE-NAME, VERSION, BUG-REPORT-ADDRESS)
+#AC_WITH_LTDL  # not needed ?
+AM_INIT_AUTOMAKE(lttv,0.12.17-01072009)
+AM_CONFIG_HEADER(config.h)
+AM_PROG_LIBTOOL
+
+AM_PATH_GLIB_2_0(2.4.0, ,AC_MSG_ERROR([glib is required in order to compile LinuxTraceToolkit - download it from ftp://ftp.gtk.org/pub/gtk]) , gmodule)
+
+AM_PATH_GTK_2_0(2.4.0, ,AC_MSG_ERROR([gtk is required in order to compile GUI - download it from ftp://ftp.gtk.org/pub/gtk]) , gmodule)
+
+AC_PATH_PROGS(BASH, bash)
+
+AC_SYS_LARGEFILE
+
+# Checks for programs.
+AC_PROG_CC
+
+# Checks for libraries.
+AC_CHECK_LIB([popt], [poptGetNextOpt], POPT_LIBS="-lpopt",AC_MSG_ERROR([libpopt is required in order to compile LinuxTraceToolkit])  )
+#AC_CHECK_LIB([m], [round], M_LIBS="-lm",AC_MSG_ERROR([Mathematical libraries are missing.])  )
+
+AC_CHECK_LIB([util], [forkpty], UTIL_LIBS="-lutil", AC_MSG_ERROR([libutil is required in order to compile LinuxTraceToolkit]))
+
+
+# pthread for gdb with dlopen().
+AC_CHECK_LIB(pthread, pthread_join, [], AC_MSG_ERROR([LinuxThreads is required in order to make sure gdb works fine with lttv-gui]))
+
+# Checks for header files.
+AC_HEADER_STDC
+AC_CHECK_HEADERS([fcntl.h stdlib.h string.h sys/time.h unistd.h pthread.h])
+
+AC_ISC_POSIX
+AC_PROG_CC
+AM_PROG_CC_STDC
+AC_HEADER_STDC
+
+pkg_modules="gtk+-2.0 >= 2.0.0"
+PKG_CHECK_MODULES(GTK, [$pkg_modules])
+
+pkg_modules="gobject-2.0 >= 2.0.0"
+PKG_CHECK_MODULES(GOBJECT, [$pkg_modules])
+
+LIBS="$LIBS $GTK_LIBS $GOBJECT_LIBS"
+PACKAGE_CFLAGS="$GTK_CFLAGS $GOBJECT_CFLAGS -Wall -Wformat"
+MODULE_CFLAGS="$PACKAGE_CFLAGS -fvisibility=hidden"
+MODULE_LDFLAGS="-module -avoid-version"
+AC_SUBST([PACKAGE_CFLAGS])
+AC_SUBST([MODULE_CFLAGS])
+AC_SUBST([MODULE_LDFLAGS])
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_HEADER_STDBOOL
+AC_C_CONST
+AC_C_INLINE
+AC_TYPE_OFF_T
+AC_TYPE_SIZE_T
+AC_HEADER_TIME
+
+# Checks for library functions.
+AC_FUNC_ERROR_AT_LINE
+#AC_FUNC_MALLOC
+AC_FUNC_SELECT_ARGTYPES
+AC_CHECK_FUNCS([select])
+
+#CPPFLAGS="$CPPFLAGS -I"
+
+AC_ARG_ENABLE(lttvstatic,
+       AC_HELP_STRING( [--enable-lttvstatic],
+               [Build a statically linked executable @<:@default=no@:>@]),
+               [with_lttvstatic="yes"],
+               [with_lttvstatic="no"])
+AM_CONDITIONAL(LTTVSTATIC, test "x$with_lttvstatic" = "xyes")
+lttvlibdir="${libdir}/lttv"
+lttvplugindir="${lttvlibdir}/plugins"
+#lttlibdir="${libdir}/ltt"
+top_lttvdir="\$(top_srcdir)/lttv"
+top_lttvwindowdir="\$(top_srcdir)/lttv/modules/gui/lttvwindow"
+
+DEFAULT_INCLUDES="-I\$(top_srcdir) -I\$(top_builddir) -I\$(top_lttvdir) -I\$(top_lttvwindowdir)"
+
+lttincludedir="${includedir}/ltt"
+lttvincludedir="${includedir}/lttv"
+lttvwindowincludedir="${includedir}/lttvwindow"
+lttctlincludedir="${includedir}/liblttctl"
+
+AC_SUBST([POPT_LIBS])
+AC_SUBST([UTIL_LIBS])
+AC_SUBST(lttvlibdir)
+AC_SUBST(lttvplugindir)
+#AC_SUBST(lttlibdir)
+AC_SUBST(top_lttvdir)
+AC_SUBST(top_lttvwindowdir)
+AC_SUBST(DEFAULT_INCLUDES)
+AC_SUBST(lttincludedir)
+AC_SUBST(lttvincludedir)
+AC_SUBST(lttvwindowincludedir)
+AC_SUBST(lttctlincludedir)
+
+                #lttv/modules/gui/tutorial/Makefile
+                #lttv/modules/gui/diskperformance/Makefile
+AC_CONFIG_FILES([Makefile
+                lttv/Makefile
+                lttv/lttv/Makefile
+                lttv/modules/Makefile
+                lttv/modules/text/Makefile
+                lttv/modules/gui/Makefile
+                lttv/modules/gui/lttvwindow/Makefile
+                lttv/modules/gui/interrupts/Makefile
+                lttv/modules/gui/lttvwindow/lttvwindow/Makefile
+                lttv/modules/gui/lttvwindow/pixmaps/Makefile
+                lttv/modules/gui/controlflow/Makefile
+                lttv/modules/gui/detailedevents/Makefile
+                lttv/modules/gui/statistics/Makefile
+                lttv/modules/gui/histogram/Makefile
+                 lttv/modules/gui/filter/Makefile
+                 lttv/modules/gui/tracecontrol/Makefile
+                 lttv/modules/gui/resourceview/Makefile
+                ltt/Makefile
+     doc/Makefile
+     doc/developer/Makefile
+     doc/developer/developer_guide/Makefile
+     doc/developer/developer_guide/docbook/Makefile
+     doc/developer/developer_guide/html/Makefile
+     doc/user/Makefile
+     doc/user/user_guide/Makefile
+     doc/user/user_guide/docbook/Makefile
+     doc/user/user_guide/html/Makefile])
+AC_OUTPUT
diff --git a/configure.in b/configure.in
deleted file mode 100644 (file)
index 67da0ca..0000000
+++ /dev/null
@@ -1,151 +0,0 @@
-# This file is part of the Linux Trace Toolkit viewer
-# Copyright (C) 2003-2004 Mathieu Desnoyers
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License Version 2 as
-# published by the Free Software Foundation;
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
-# MA 02111-1307, USA.
-
-
-
-#                                               -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.57)
-AC_INIT(FULL-PACKAGE-NAME, VERSION, BUG-REPORT-ADDRESS)
-#AC_WITH_LTDL  # not needed ?
-AM_INIT_AUTOMAKE(lttv,0.12.17-01072009)
-AM_CONFIG_HEADER(config.h)
-AM_PROG_LIBTOOL
-
-AM_PATH_GLIB_2_0(2.4.0, ,AC_MSG_ERROR([glib is required in order to compile LinuxTraceToolkit - download it from ftp://ftp.gtk.org/pub/gtk]) , gmodule)
-
-AM_PATH_GTK_2_0(2.4.0, ,AC_MSG_ERROR([gtk is required in order to compile GUI - download it from ftp://ftp.gtk.org/pub/gtk]) , gmodule)
-
-AC_PATH_PROGS(BASH, bash)
-
-AC_SYS_LARGEFILE
-
-# Checks for programs.
-AC_PROG_CC
-
-# Checks for libraries.
-AC_CHECK_LIB([popt], [poptGetNextOpt], POPT_LIBS="-lpopt",AC_MSG_ERROR([libpopt is required in order to compile LinuxTraceToolkit])  )
-#AC_CHECK_LIB([m], [round], M_LIBS="-lm",AC_MSG_ERROR([Mathematical libraries are missing.])  )
-
-AC_CHECK_LIB([util], [forkpty], UTIL_LIBS="-lutil", AC_MSG_ERROR([libutil is required in order to compile LinuxTraceToolkit]))
-
-
-# pthread for gdb with dlopen().
-AC_CHECK_LIB(pthread, pthread_join, [], AC_MSG_ERROR([LinuxThreads is required in order to make sure gdb works fine with lttv-gui]))
-
-# Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS([fcntl.h stdlib.h string.h sys/time.h unistd.h pthread.h])
-
-AC_ISC_POSIX
-AC_PROG_CC
-AM_PROG_CC_STDC
-AC_HEADER_STDC
-
-pkg_modules="gtk+-2.0 >= 2.0.0"
-PKG_CHECK_MODULES(GTK, [$pkg_modules])
-
-pkg_modules="gobject-2.0 >= 2.0.0"
-PKG_CHECK_MODULES(GOBJECT, [$pkg_modules])
-
-LIBS="$LIBS $GTK_LIBS $GOBJECT_LIBS"
-PACKAGE_CFLAGS="$GTK_CFLAGS $GOBJECT_CFLAGS -Wall -Wformat"
-MODULE_CFLAGS="$PACKAGE_CFLAGS -fvisibility=hidden"
-MODULE_LDFLAGS="-module -avoid-version"
-AC_SUBST([PACKAGE_CFLAGS])
-AC_SUBST([MODULE_CFLAGS])
-AC_SUBST([MODULE_LDFLAGS])
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_HEADER_STDBOOL
-AC_C_CONST
-AC_C_INLINE
-AC_TYPE_OFF_T
-AC_TYPE_SIZE_T
-AC_HEADER_TIME
-
-# Checks for library functions.
-AC_FUNC_ERROR_AT_LINE
-#AC_FUNC_MALLOC
-AC_FUNC_SELECT_ARGTYPES
-AC_CHECK_FUNCS([select])
-
-#CPPFLAGS="$CPPFLAGS -I"
-
-AC_ARG_ENABLE(lttvstatic,
-       AC_HELP_STRING( [--enable-lttvstatic],
-               [Build a statically linked executable @<:@default=no@:>@]),
-               [with_lttvstatic="yes"],
-               [with_lttvstatic="no"])
-AM_CONDITIONAL(LTTVSTATIC, test "x$with_lttvstatic" = "xyes")
-lttvlibdir="${libdir}/lttv"
-lttvplugindir="${lttvlibdir}/plugins"
-#lttlibdir="${libdir}/ltt"
-top_lttvdir="\$(top_srcdir)/lttv"
-top_lttvwindowdir="\$(top_srcdir)/lttv/modules/gui/lttvwindow"
-
-DEFAULT_INCLUDES="-I\$(top_srcdir) -I\$(top_builddir) -I\$(top_lttvdir) -I\$(top_lttvwindowdir)"
-
-lttincludedir="${includedir}/ltt"
-lttvincludedir="${includedir}/lttv"
-lttvwindowincludedir="${includedir}/lttvwindow"
-lttctlincludedir="${includedir}/liblttctl"
-
-AC_SUBST([POPT_LIBS])
-AC_SUBST([UTIL_LIBS])
-AC_SUBST(lttvlibdir)
-AC_SUBST(lttvplugindir)
-#AC_SUBST(lttlibdir)
-AC_SUBST(top_lttvdir)
-AC_SUBST(top_lttvwindowdir)
-AC_SUBST(DEFAULT_INCLUDES)
-AC_SUBST(lttincludedir)
-AC_SUBST(lttvincludedir)
-AC_SUBST(lttvwindowincludedir)
-AC_SUBST(lttctlincludedir)
-
-                #lttv/modules/gui/tutorial/Makefile
-                #lttv/modules/gui/diskperformance/Makefile
-AC_CONFIG_FILES([Makefile
-                lttv/Makefile
-                lttv/lttv/Makefile
-                lttv/modules/Makefile
-                lttv/modules/text/Makefile
-                lttv/modules/gui/Makefile
-                lttv/modules/gui/lttvwindow/Makefile
-                lttv/modules/gui/interrupts/Makefile
-                lttv/modules/gui/lttvwindow/lttvwindow/Makefile
-                lttv/modules/gui/lttvwindow/pixmaps/Makefile
-                lttv/modules/gui/controlflow/Makefile
-                lttv/modules/gui/detailedevents/Makefile
-                lttv/modules/gui/statistics/Makefile
-                lttv/modules/gui/histogram/Makefile
-                 lttv/modules/gui/filter/Makefile
-                 lttv/modules/gui/tracecontrol/Makefile
-                 lttv/modules/gui/resourceview/Makefile
-                ltt/Makefile
-     doc/Makefile
-     doc/developer/Makefile
-     doc/developer/developer_guide/Makefile
-     doc/developer/developer_guide/docbook/Makefile
-     doc/developer/developer_guide/html/Makefile
-     doc/user/Makefile
-     doc/user/user_guide/Makefile
-     doc/user/user_guide/docbook/Makefile
-     doc/user/user_guide/html/Makefile])
-AC_OUTPUT
This page took 0.029055 seconds and 4 git commands to generate.