[Pkg-wmaker-commits] [wmrack] 54/97: debian/patches/update_autotools.patch: Update to work with modern autotools.
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Sat Aug 22 02:42:05 UTC 2015
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmrack.
commit 8cf80765d9debc7c64ee5ae6a172f3164675ca1e
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date: Thu Aug 14 20:24:14 2014 -0500
debian/patches/update_autotools.patch: Update to work with modern autotools.
---
debian/patches/series | 1 +
debian/patches/update_autotools.patch | 248 ++++++++++++++++++++++++++++++++++
2 files changed, 249 insertions(+)
diff --git a/debian/patches/series b/debian/patches/series
index 35e8979..2192463 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
add_format_arg_to_fprintf.patch
+update_autotools.patch
diff --git a/debian/patches/update_autotools.patch b/debian/patches/update_autotools.patch
new file mode 100644
index 0000000..43e5983
--- /dev/null
+++ b/debian/patches/update_autotools.patch
@@ -0,0 +1,248 @@
+Description: Update autotools files
+ In particular,
+ - rename configure.in to configure.ac
+ - avoid "missing template" warning for HAVE_GNUSTEP
+ - avoid "'Makefile.in' seems to ignore the --datarootdir setting" warning
+Author: Doug Torrance <dtorrance at monmouthcollege.edu>
+Last-Update: 2014-08-14
+
+--- a/configure.in
++++ /dev/null
+@@ -1,107 +0,0 @@
+-dnl
+-dnl WMRack autoconf stuff
+-dnl
+-dnl Copyright (c) 1997 by Oliver Graf <ograf at fga.de>
+-dnl
+-
+-AC_INIT(wmrack.c)
+-AC_CONFIG_HEADER(config.h)
+-
+-dnl package switches
+-dnl
+-dnl AC_ARG_WITH(cdplayer,[ --with-cdplayer Include cdplayer support.])
+-dnl AC_ARG_WITH(mixer, [ --with-mixer Include mixer support.])
+-AC_ARG_WITH(debug, [ --with-debug Compile with extra debug messages.])
+-AC_ARG_WITH(gnustep, \
+-[ --without-gnustep Don't use GNUstep style library paths.])
+-
+-dnl check for standart compile && install stuff
+-dnl
+-AC_PROG_CC
+-AC_PROG_INSTALL
+-AC_PROG_LN_S
+-
+-AC_SUBST(INSTALL)
+-
+-dnl check for needed headers
+-dnl
+-AC_HEADER_STDC
+-AC_CHECK_HEADER(unistd.h)
+-
+-dnl Check for Linux CDROM support
+-dnl
+-dnl if test "x${enable_cdplayer}" = "xno"; then
+-dnl AC_MSG_WARN([cdplayer feature disabled])
+-dnl else
+-dnl AC_MSG_CHECKING([for cdplayer support])
+-dnl AC_EGREP_HEADER([struct cdrom_msf],linux/cdrom.h,[echo yes
+-dnl AC_DEFINE(WITH_CDPLAYER,linux)],[echo no])
+-dnl fi
+-
+-dnl Check for Linux MIXER support
+-dnl
+-dnl if test "x${enable_mixer}" = "xno"; then
+-dnl AC_MSG_WARN([mixer feature disabled])
+-dnl else
+-dnl AC_MSG_CHECKING([for mixer support])
+-dnl AC_EGREP_HEADER([typedef struct mixer_info],linux/soundcard.h,[echo yes
+-dnl AC_DEFINE(WITH_MIXER,linux)],[echo no])
+-dnl fi
+-
+-dnl check for X11
+-dnl
+-AC_PATH_X
+-if test "x$no_x" = "xyes"; then
+- AC_MSG_ERROR([WMRack needs X Windows!!!])
+-else
+- CFLAGS="$CFLAGS ${x_includes:+-I$x_includes}"
+- LIBS="$LIBS ${x_libraries:+-L$x_libraries} -lX11"
+- CPPFLAGS="$CPPFLAGS ${x_includes:+-I$x_includes}"
+-fi
+-
+-dnl check for Xpm
+-dnl
+-AC_CHECK_LIB(Xpm,XpmCreatePixmapFromBuffer,\
+- [LIBS="$LIBS -lXpm"],\
+- AC_MSG_ERROR([WMRack needs XPM support!!!]),\
+- -lX11)
+-
+-dnl check for Shape extensions
+-dnl
+-AC_CHECK_HEADER(X11/extensions/shape.h,[],\
+- [AC_MSG_ERROR([WMRack needs X11 Shape extensions!!!])])
+-AC_CHECK_LIB(Xext,XShapeCombineMask,\
+- [LIBS="$LIBS -lXext"],\
+- AC_MSG_ERROR([WMRack needs the X11 extension library!!!]),\
+- -lX11)
+-
+-dnl check for extra package options
+-dnl
+-echo
+-
+-dnl DEBUG
+-if test "x${with_debug}" = "xyes"; then
+- echo "adding extra DEBUG output"
+- CFLAGS="-ggdb -DDEBUG $CFLAGS"
+-fi
+-
+-dnl GNUstep paths
+-if test "x${with_gnustep}" = "xno"; then
+- echo "GNUstep path standarts disabled"
+-else
+- echo -n "Trying to detect GNUstep paths..."
+- if test -d "$prefix/GNUstep" -o -d "$ac_default_prefix/GNUstep"; then
+- libdir=[\${prefix}/GNUstep/Library]
+- echo " $libdir"
+- AC_DEFINE(HAVE_GNUSTEP)
+- else
+- echo " NOT FOUND -- DISABLED"
+- fi
+-fi
+-
+-echo
+-
+-dnl All done
+-dnl create output
+-dnl
+-AC_OUTPUT(Makefile XPM/Makefile)
+--- /dev/null
++++ b/configure.ac
+@@ -0,0 +1,107 @@
++dnl
++dnl WMRack autoconf stuff
++dnl
++dnl Copyright (c) 1997 by Oliver Graf <ograf at fga.de>
++dnl
++
++AC_INIT(wmrack.c)
++AC_CONFIG_HEADER(config.h)
++
++dnl package switches
++dnl
++dnl AC_ARG_WITH(cdplayer,[ --with-cdplayer Include cdplayer support.])
++dnl AC_ARG_WITH(mixer, [ --with-mixer Include mixer support.])
++AC_ARG_WITH(debug, [ --with-debug Compile with extra debug messages.])
++AC_ARG_WITH(gnustep, \
++[ --without-gnustep Don't use GNUstep style library paths.])
++
++dnl check for standart compile && install stuff
++dnl
++AC_PROG_CC
++AC_PROG_INSTALL
++AC_PROG_LN_S
++
++AC_SUBST(INSTALL)
++
++dnl check for needed headers
++dnl
++AC_HEADER_STDC
++AC_CHECK_HEADER(unistd.h)
++
++dnl Check for Linux CDROM support
++dnl
++dnl if test "x${enable_cdplayer}" = "xno"; then
++dnl AC_MSG_WARN([cdplayer feature disabled])
++dnl else
++dnl AC_MSG_CHECKING([for cdplayer support])
++dnl AC_EGREP_HEADER([struct cdrom_msf],linux/cdrom.h,[echo yes
++dnl AC_DEFINE(WITH_CDPLAYER,linux)],[echo no])
++dnl fi
++
++dnl Check for Linux MIXER support
++dnl
++dnl if test "x${enable_mixer}" = "xno"; then
++dnl AC_MSG_WARN([mixer feature disabled])
++dnl else
++dnl AC_MSG_CHECKING([for mixer support])
++dnl AC_EGREP_HEADER([typedef struct mixer_info],linux/soundcard.h,[echo yes
++dnl AC_DEFINE(WITH_MIXER,linux)],[echo no])
++dnl fi
++
++dnl check for X11
++dnl
++AC_PATH_X
++if test "x$no_x" = "xyes"; then
++ AC_MSG_ERROR([WMRack needs X Windows!!!])
++else
++ CFLAGS="$CFLAGS ${x_includes:+-I$x_includes}"
++ LIBS="$LIBS ${x_libraries:+-L$x_libraries} -lX11"
++ CPPFLAGS="$CPPFLAGS ${x_includes:+-I$x_includes}"
++fi
++
++dnl check for Xpm
++dnl
++AC_CHECK_LIB(Xpm,XpmCreatePixmapFromBuffer,\
++ [LIBS="$LIBS -lXpm"],\
++ AC_MSG_ERROR([WMRack needs XPM support!!!]),\
++ -lX11)
++
++dnl check for Shape extensions
++dnl
++AC_CHECK_HEADER(X11/extensions/shape.h,[],\
++ [AC_MSG_ERROR([WMRack needs X11 Shape extensions!!!])])
++AC_CHECK_LIB(Xext,XShapeCombineMask,\
++ [LIBS="$LIBS -lXext"],\
++ AC_MSG_ERROR([WMRack needs the X11 extension library!!!]),\
++ -lX11)
++
++dnl check for extra package options
++dnl
++echo
++
++dnl DEBUG
++if test "x${with_debug}" = "xyes"; then
++ echo "adding extra DEBUG output"
++ CFLAGS="-ggdb -DDEBUG $CFLAGS"
++fi
++
++dnl GNUstep paths
++if test "x${with_gnustep}" = "xno"; then
++ echo "GNUstep path standarts disabled"
++else
++ echo -n "Trying to detect GNUstep paths..."
++ if test -d "$prefix/GNUstep" -o -d "$ac_default_prefix/GNUstep"; then
++ libdir=[\${prefix}/GNUstep/Library]
++ echo " $libdir"
++ AC_DEFINE(HAVE_GNUSTEP, 1, [Define if you want GNUstep compliant paths.])
++ else
++ echo " NOT FOUND -- DISABLED"
++ fi
++fi
++
++echo
++
++dnl All done
++dnl create output
++dnl
++AC_OUTPUT(Makefile XPM/Makefile)
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -24,6 +24,7 @@
+ BINDIR = @bindir@
+ MANDIR = @mandir@
+ LIBDIR = @libdir@/WMRack
++datarootdir = @datarootdir@
+
+ MAN1DIR = $(MANDIR)/man1
+
+--- a/XPM/Makefile.in
++++ b/XPM/Makefile.in
+@@ -8,6 +8,7 @@
+ BINDIR = @bindir@
+ MANDIR = @mandir@
+ LIBDIR = @libdir@/WMRack
++datarootdir = @datarootdir@
+
+ standart.style: grey.style
+ $(LN) grey.style standart.style
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmrack.git
More information about the Pkg-wmaker-commits
mailing list