Fix configure.in and Makefile.am to add proper xlib flags.
authorHong Jen Yee (PCMan) <pcman.tw@gmail.com>
Tue, 3 Aug 2010 09:06:44 +0000 (17:06 +0800)
committerHong Jen Yee (PCMan) <pcman.tw@gmail.com>
Tue, 3 Aug 2010 09:07:30 +0000 (17:07 +0800)
configure.in
po/lxinput.pot [deleted file]
src/Makefile.am

index e4f32b2..df31acc 100644 (file)
@@ -18,6 +18,10 @@ PKG_CHECK_MODULES(GTK, [$pkg_modules])
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
 
+PKG_CHECK_MODULES(XLIB, "x11")
+AC_SUBST(XLIB_CFLAGS)
+AC_SUBST(XLIB_LIBS)
+
 AC_ARG_ENABLE(man,
        [AC_HELP_STRING([--enable-man],
                [regenerate roff man pages from Docbook @<:@default=no@:>@])],
@@ -41,16 +45,16 @@ AM_GLIB_GNU_GETTEXT
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])
 
 if test x"$enable_man" = x"yes"; then
-       AC_PATH_PROG([XSLTPROC], [xsltproc])
-       if test -z "$XSLTPROC"; then
-               enable_man=no
-       fi
-
-       dnl check for DocBook DTD and stylesheets in the local catalog.
-       JH_CHECK_XML_CATALOG([-//OASIS//DTD DocBook XML V4.1.2//EN],
-               [DocBook XML DTD V4.1.2], [], enable_man=no)
-       JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl],
-               [DocBook XSL Stylesheets >= 1.70.1], [], enable_man=no)
+    AC_PATH_PROG([XSLTPROC], [xsltproc])
+    if test -z "$XSLTPROC"; then
+        enable_man=no
+    fi
+
+    dnl check for DocBook DTD and stylesheets in the local catalog.
+    JH_CHECK_XML_CATALOG([-//OASIS//DTD DocBook XML V4.1.2//EN],
+        [DocBook XML DTD V4.1.2], [], enable_man=no)
+    JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl],
+        [DocBook XSL Stylesheets >= 1.70.1], [], enable_man=no)
 fi
 
 AM_CONDITIONAL(ENABLE_REGENERATE_MAN, test "x$enable_man" != "xno")
diff --git a/po/lxinput.pot b/po/lxinput.pot
deleted file mode 100644 (file)
index 3b9c60e..0000000
+++ /dev/null
@@ -1,109 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-24 01:27+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../data/lxinput.glade.h:1
-msgid "<b>Character Repeat</b>"
-msgstr ""
-
-#: ../data/lxinput.glade.h:2
-msgid "<b>Motion</b>"
-msgstr ""
-
-#: ../data/lxinput.glade.h:3
-msgid "Acceleration:"
-msgstr ""
-
-#: ../data/lxinput.glade.h:4
-msgid "Beep when there is an error of keyboard input"
-msgstr ""
-
-#: ../data/lxinput.glade.h:5
-msgid "Delay before each key starts repeating"
-msgstr ""
-
-#: ../data/lxinput.glade.h:6
-msgid "Fast"
-msgstr ""
-
-#: ../data/lxinput.glade.h:7
-msgid "High"
-msgstr ""
-
-#: ../data/lxinput.glade.h:8
-msgid "Input Device Preferences"
-msgstr ""
-
-#: ../data/lxinput.glade.h:9
-msgid "Interval between each key repeat"
-msgstr ""
-
-#: ../data/lxinput.glade.h:10
-msgid "Keyboard"
-msgstr ""
-
-#: ../data/lxinput.glade.h:11
-msgid "Left handed (Swap left and right mouse buttons)"
-msgstr ""
-
-#: ../data/lxinput.glade.h:12
-msgid "Long"
-msgstr ""
-
-#: ../data/lxinput.glade.h:13
-msgid "Low"
-msgstr ""
-
-#: ../data/lxinput.glade.h:14
-msgid "Mouse"
-msgstr ""
-
-#: ../data/lxinput.glade.h:15
-msgid "Repeat delay:"
-msgstr ""
-
-#: ../data/lxinput.glade.h:16
-msgid "Repeat interval:"
-msgstr ""
-
-#: ../data/lxinput.glade.h:17
-msgid "Sensitivity:"
-msgstr ""
-
-#: ../data/lxinput.glade.h:18
-msgid "Short"
-msgstr ""
-
-#: ../data/lxinput.glade.h:19
-msgid "Slow"
-msgstr ""
-
-#: ../data/lxinput.glade.h:20
-msgid "Touch Pad"
-msgstr ""
-
-#: ../data/lxinput.glade.h:21
-msgid "Type in the following box to test your keyboard settings"
-msgstr ""
-
-#: ../data/lxinput.desktop.in.h:1
-msgid "Configure keyboard, mouse, and other input devices"
-msgstr ""
-
-#: ../data/lxinput.desktop.in.h:2
-msgid "Keyboard and Mouse"
-msgstr ""
index 0c1e4d0..5719b09 100644 (file)
@@ -1,7 +1,8 @@
 INCLUDES = \
        -DPACKAGE_DATA_DIR=\""$(datadir)"/lxinput\" \
        -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-       @GTK_CFLAGS@ \
+       $(GTK_CFLAGS) \
+       $(XLIB_CFLAGS)
        -Werror-implicit-function-declaration
 
 bin_PROGRAMS = lxinput
@@ -9,9 +10,12 @@ bin_PROGRAMS = lxinput
 lxinput_SOURCES = \
        lxinput.c
 
-lxinput_LDADD = @GTK_LIBS@ $(INTLLIBS)
+lxinput_LDADD = \
+       $(GTK_LIBS) \
+       $(XLIB_LIBS) \
+       $(INTLLIBS)
 
 noinst_PROGRAMS=xml-purge
 xml_purge_SOURCES=xml-purge.c
-xml_purge_CFLAGS=@GTK_CFLAGS@
-xml_purge_LDADD=@GTK_LIBS@
+xml_purge_CFLAGS=$(GTK_CFLAGS)
+xml_purge_LDADD=$(GTK_LIBS)