Permalink
Browse files

Removed acconfig.h and replaced with AH_TEMPLATE AND AC_DEFINE.

  • Loading branch information...
1 parent b8da962 commit 8a6466a545c33e358ccdec400f53c5d3473a6bbb @szesch szesch committed Apr 4, 2012
Showing with 31 additions and 28 deletions.
  1. +0 −27 acconfig.h
  2. +31 −1 configure.in
View
@@ -1,27 +0,0 @@
-#undef ENABLE_INSTALLER
-#undef ENABLE_NLS
-#undef ENABLE_PROFILER
-#undef GETTEXT_PACKAGE
-#undef HAVE_CATGETS
-#undef HAVE_GETTEXT
-#undef HAVE_LC_MESSAGES
-#undef HAVE_LIBBZ2
-#undef HAVE_LIBJPEG
-#undef HAVE_MEDUSA
-#undef HAVE_STPCPY
-#undef bzclose
-#undef bzCompress
-#undef bzCompressInit
-#undef bzDecompress
-#undef bzDecompressInit
-#undef bzdopen
-#undef bzerror
-#undef bzflush
-#undef bzopen
-#undef bzread
-#undef bzwrite
-#define HAVE_GTK_MULTIHEAD /* needed for egg-screen-exec functions */
-#undef HAVE_STARTUP_NOTIFICATION
-#undef HAVE_EXIF
-#undef HAVE_OLD_EXIF
-#undef HAVE_RENDER
View
@@ -19,7 +19,7 @@ dnl Interface break is not allowed.
m4_define(caja_extension_current, 3)
m4_define(caja_extension_revision, 0)
-AC_INIT([caja], [1.2.0], [http://www.mate-desktop.org])
+AC_INIT([caja], [1.2.1], [http://www.mate-desktop.org])
dnl ---------------------------------------------------------------------------
dnl GTK library version
@@ -102,6 +102,36 @@ AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",
[the gettext translation domain])
+AH_TEMPLATE([ENABLE_INSTALLER])
+AH_TEMPLATE([ENABLE_NLS])
+AH_TEMPLATE([ENABLE_PROFILER])
+AH_TEMPLATE([GETTEXT_PACKAGE])
+AH_TEMPLATE([HAVE_CATGETS])
+AH_TEMPLATE([HAVE_GETTEXT])
+AH_TEMPLATE([HAVE_LC_MESSAGES])
+AH_TEMPLATE([HAVE_LIBBZ2])
+AH_TEMPLATE([HAVE_LIBJPEG])
+AH_TEMPLATE([HAVE_MEDUSA])
+AH_TEMPLATE([HAVE_STPCPY])
+AH_TEMPLATE([bzclose])
+AH_TEMPLATE([bzCompress])
+AH_TEMPLATE([bzCompressInit])
+AH_TEMPLATE([bzDecompress])
+AH_TEMPLATE([bzDecompressInit])
+AH_TEMPLATE([bzdopen])
+AH_TEMPLATE([bzerror])
+AH_TEMPLATE([bzflush])
+AH_TEMPLATE([bzopen])
+AH_TEMPLATE([bzread])
+AH_TEMPLATE([bzwrite])
+
+AC_DEFINE([HAVE_GTK_MULTIHEAD], [], [needed for egg-screen-exec functions])
+
+AH_TEMPLATE([HAVE_STARTUP_NOTIFICATION])
+AH_TEMPLATE([HAVE_EXIF])
+AH_TEMPLATE([HAVE_OLD_EXIF])
+AH_TEMPLATE([HAVE_RENDER])
+
AM_GLIB_GNU_GETTEXT
GLIB_DEFINE_LOCALEDIR(MATELOCALEDIR)

0 comments on commit 8a6466a

Please sign in to comment.