Skip to content

Commit

Permalink
Use tabs for indentation, spaces for alignment.
Browse files Browse the repository at this point in the history
Use anonymous namespace instead of static
Open-webOS-DCO-1.0-Signed-off-by: Anatolii Sakhnik <[email protected]>

Change-Id: Iaea6e3863b31b34eccb627d4dc68d96ca3b2566f
  • Loading branch information
sakhnik committed Aug 1, 2013
1 parent b584ac1 commit ea4ddc4
Show file tree
Hide file tree
Showing 43 changed files with 1,951 additions and 1,931 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ missing
/nbproject/private/
/nbproject
test-driver
compile
68 changes: 34 additions & 34 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -29,55 +29,55 @@ BOOST_CPPFLAGS=$BOOST_CPPFLAGS" -DBOOST_DISABLE_THREADS"
dnl --------------------------------------------------------------------------
dnl X clipboard support
AC_ARG_ENABLE(
[xclip],
AS_HELP_STRING([--enable-xclip=[yes]],
[Enable copying to the X clipboard (yes,no,gtk2,gtk3)])
[xclip],
AS_HELP_STRING([--enable-xclip=[yes]],
[Enable copying to the X clipboard (yes,no,gtk2,gtk3)])
)

AC_MSG_CHECKING(--enable-xclip argument)
AS_CASE([$enable_xclip],
[no], [AC_MSG_RESULT(no X clipboard support)],
[yes|""],[AC_MSG_RESULT(yes - automatic X clipboard support)
enable_xclip=yes],
[gtk*], [AC_MSG_RESULT([yes - using $enable_xclip])],
[AC_MSG_RESULT([Sorry, $enable_xclip X clipboard is not supported])]
[no], [AC_MSG_RESULT(no X clipboard support)],
[yes|""],[AC_MSG_RESULT(yes - automatic X clipboard support)
enable_xclip=yes],
[gtk*], [AC_MSG_RESULT([yes - using $enable_xclip])],
[AC_MSG_RESULT([Sorry, $enable_xclip X clipboard is not supported])]
)

AS_IF([test "x$enable_xclip" = "xgtk3"],[
PKG_CHECK_MODULES([GTK],
[gtk+-3.0],
[gtk_found=yes])
PKG_CHECK_MODULES([GTK],
[gtk+-3.0],
[gtk_found=yes])
])

AS_IF([test "x$enable_xclip" = "xgtk2"],[
PKG_CHECK_MODULES([GTK],
[gtk+-2.0],
[gtk_found=yes])
PKG_CHECK_MODULES([GTK],
[gtk+-2.0],
[gtk_found=yes])
])

AS_IF([test "x$enable_xclip" = "xyes"],[
PKG_CHECK_MODULES([GTK],
[gtk+-3.0],
[gtk_found=yes enable_xclip=gtk3],
[gtk_found=no])
PKG_CHECK_MODULES([GTK],
[gtk+-3.0],
[gtk_found=yes enable_xclip=gtk3],
[gtk_found=no])
])

AS_IF([test "x$enable_xclip" = "xyes"],[
PKG_CHECK_MODULES([GTK],
[gtk+-2.0],
[gtk_found=yes enable_xclip=gtk2],
[gtk_found=no])
PKG_CHECK_MODULES([GTK],
[gtk+-2.0],
[gtk_found=yes enable_xclip=gtk2],
[gtk_found=no])
])

AS_IF([test "x$gtk_found" = "xyes"],[
AC_DEFINE([ENABLE_GTK],[1],[Define to compile with GTK+ support])
AC_DEFINE([ENABLE_XCLIP],[1],[Define to compile with X clipboard support])
AC_DEFINE([ENABLE_GTK],[1],[Define to compile with GTK+ support])
AC_DEFINE([ENABLE_XCLIP],[1],[Define to compile with X clipboard support])
])

AM_CONDITIONAL([ENABLE_GTK],[test "x$gtk_found" = "xyes"])

AS_IF([test "x$enable_xclip" = "xyes"],[
AC_MSG_ERROR([No suitable X clipboard support library found])
AC_MSG_ERROR([No suitable X clipboard support library found])
])

AM_CONDITIONAL([ENABLE_XCLIP],[test "x$enable_xclip" != "xno"])
Expand All @@ -86,19 +86,19 @@ dnl --------------------------------------------------------------------------
dnl Documentation support

AC_ARG_ENABLE(doc,
AS_HELP_STRING([--enable-doc=yes], [Build man pages (yes by default)]),
[wantdoc=$enableval], [wantdoc=yes])
AS_HELP_STRING([--enable-doc=yes], [Build man pages (yes by default)]),
[wantdoc=$enableval], [wantdoc=yes])

AC_MSG_CHECKING([for building documentation])
AS_IF([test "x$wantdoc" = "xyes"], [
AC_MSG_RESULT([yes])
AC_CHECK_PROGS([ASCIIDOC], [asciidoc])
AS_IF([test $ASCIIDOC], [
], [
AC_MSG_ERROR([asciidoc is required to build man pages])
])],
AC_MSG_RESULT([yes])
AC_CHECK_PROGS([ASCIIDOC], [asciidoc])
AS_IF([test $ASCIIDOC], [
], [
AC_MSG_ERROR([asciidoc is required to build man pages])
])],
[
AC_MSG_RESULT([no])
AC_MSG_RESULT([no])
])
AM_CONDITIONAL(WANT_DOC, [test "x$wantdoc" = "xyes"])

Expand Down
4 changes: 2 additions & 2 deletions doc/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ man_MANS = gpwsafe.1

gpwsafe.1: gpwsafe.1.txt Makefile.am
$(AM_V_GEN)a2x $(A2X_OPTS) \
--asciidoc-opts="$(ASCIIDOC_OPTS) --out-file=./$@.xml" \
$(srcdir)/$@.txt
--asciidoc-opts="$(ASCIIDOC_OPTS) --out-file=./$@.xml" \
$(srcdir)/$@.txt

# Files that should be removed
MOSTLYCLEANFILES = gpwsafe.1
Expand Down
Loading

0 comments on commit ea4ddc4

Please sign in to comment.