Update autogen.sh to match upstream.

Switch from configure.in.in to configure.ac.in and disable building of static libs.

diff --git a/autogen.sh b/autogen.sh
index 01373b996133a39c0b901711c098e0c7c7e5d11d..b099848fb0288d0d2f745e7be14551fbdd7307dc 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,9 +1,22 @@
 #!/bin/sh
 #
-# $Id$
+# Copyright (c) 2002-20011 The Xfce development team. All rights reserved.
 #
-# Copyright (c) 2002-2007
-#         The Xfce development team. All rights reserved.
+# This library is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the Free
+# Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This library 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 Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Written for Xfce by Benedikt Meurer <benny@xfce.org>.
 #
 
 (type xdt-autogen) >/dev/null 2>&1 || {
@@ -16,20 +29,5 @@ EOF
   exit 1
 }
 
-# verify that po/LINGUAS is present
-(test -f po/LINGUAS) >/dev/null 2>&1 || {
-  cat >&2 <<EOF
-autogen.sh: The file po/LINGUAS could not be found. Please check your snapshot
-            or try to checkout again.
-EOF
-  exit 1
-}
-
-# substitute revision and linguas
-linguas=`sed -e '/^#/d' po/LINGUAS`
-revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%05d\n", $2}'`
-sed -e "s/@LINGUAS@/${linguas}/g" \
-    -e "s/@REVISION@/${revision}/g" \
-    < "configure.in.in" > "configure.in"
-
+XDT_AUTOGEN_REQUIRED_VERSION="4.7.3" \
 exec xdt-autogen $@

diff --git a/configure.in.in b/configure.ac.in
similarity index 74%
rename from configure.in.in
rename to configure.ac.in
index 2d4a212d1abbeffb76bc9fab18331afd3665b310..069d8fbae59b86cd2578de352c7eee906fa6ea16 100644 (file)
--- a/configure.in.in
+++ b/configure.ac.in
@@ -17,20 +17,27 @@ AC_COPYRIGHT([Copyright (c) 2012
         Michael Orlitzky. All rights reserved.])
 AC_INIT([xfce4-hdaps], [xfce4_hdaps_version()], [http://michael.orlitzky.com/code/xfce4-hdaps.php], [xfce4-hdaps])
 AC_PREREQ([2.50])
-AC_CANONICAL_TARGET()
-AC_REVISION([$Id])
+AC_REVISION([xfce4_panel_version_build])
 
 dnl ***************************
 dnl *** Initialize automake ***
 dnl ***************************
-AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar])
+AM_INIT_AUTOMAKE([1.8 no-dist-gzip dist-bzip2 tar-ustar])
 AM_CONFIG_HEADER([config.h])
 AM_MAINTAINER_MODE()
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
+dnl *******************************
+dnl *** Check for UNIX variants ***
+dnl *******************************
+AC_AIX()
+AC_ISC_POSIX()
 
 dnl ********************************
 dnl *** Check for basic programs ***
 dnl ********************************
 AC_PROG_CC()
+AM_PROG_CC_C_O()
 AC_PROG_LD()
 AC_PROG_INSTALL()
 AC_PROG_INTLTOOL()
@@ -38,18 +45,17 @@ AC_PROG_INTLTOOL()
 dnl **************************
 dnl *** Initialize libtool ***
 dnl **************************
-AC_PROG_LIBTOOL()
+LT_PREREQ([2.2.6])
+LT_INIT([disable-static])
 
 dnl **********************************
 dnl *** Check for standard headers ***
 dnl **********************************
-AC_CHECK_HEADERS([math.h memory.h stdlib.h string.h sys/stat.h \
-                  sys/time.h time.h])
-
-dnl ************************************
-dnl *** Check for standard functions ***
-dnl ************************************
-AC_CHECK_FUNCS([])
+AC_HEADER_STDC()
+AC_CHECK_HEADERS([stdlib.h unistd.h locale.h stdio.h errno.h time.h string.h \
+                  math.h sys/types.h sys/wait.h memory.h signal.h sys/prctl.h \
+                  libintl.h])
+AC_CHECK_FUNCS([bind_textdomain_codeset])
 
 dnl ******************************
 dnl *** Check for i18n support ***
@@ -64,10 +70,10 @@ XDT_CHECK_LIBX11_REQUIRE()
 dnl ***********************************
 dnl *** Check for required packages ***
 dnl ***********************************
-XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.12.0])
-XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.7.0])
-XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.6.0])
-XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.6.0])
+XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.20.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.8.0])
+XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.8.0])
 
 dnl ***********************************
 dnl *** Check for debugging support ***