From 949a9bba13ac5f025b9a5ca1675e7367a2dd941c Mon Sep 17 00:00:00 2001 From: Ivan Wong Date: Thu, 18 Nov 2004 06:14:01 +0000 Subject: - clean up a little bit. - drop acconfig.h, use the third arg of AC_DEFINE 2004-11-17 Ivan Wong * configure.in: - clean up a little bit. - drop acconfig.h, use the third arg of AC_DEFINE instead. - allow user to specify what version (dynamic/static) of libpopt is to be used (win32 only). * acconfig.h, config.h.win: removed * src/Makefile.am: drop flags that are never used, and probably won't be used. * src/glade-catalog.c, src/glade-palette.c, src/glade-project-window.c, src/glade-widget-class.c, src/glade.h, src/main.c: use global variables instead of preprocessor definitions for data/locale/pixmaps/widgets/catalogs directory names. --- configure.in | 44 +++++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 19 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index edc9c381..129da402 100644 --- a/configure.in +++ b/configure.in @@ -28,7 +28,7 @@ dnl Gettext stuff. dnl ================================================================ GETTEXT_PACKAGE=glade-3.0 AC_SUBST(GETTEXT_PACKAGE) -AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE") +AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Name of the gettext package.]) ALL_LINGUAS="az es ms nn no pl pt ru sv ta tr uk" AM_GLIB_GNU_GETTEXT @@ -36,8 +36,7 @@ AM_GLIB_GNU_GETTEXT dnl ================================================================ dnl Start of pkg-config checks dnl ================================================================ -PKG_CHECK_MODULES(GLADE, gtk+-2.0 >= 2.2.0 libxml-2.0 >= 2.4.0) -GLADE_LIBS="${GLADE_LIBS}" +PKG_CHECK_MODULES(GLADE, gtk+-2.0 >= 2.2.0 libxml-2.0 >= 2.4.0) AC_SUBST(GLADE_LIBS) AC_SUBST(GLADE_CFLAGS) @@ -52,32 +51,31 @@ dnl This will substitute GLADE_DATA_DIR in config.h (from acconfig.h). dnl ================================================================ if test "x${datadir}" = 'x${prefix}/share'; then if test "x${prefix}" = "xNONE"; then - AC_DEFINE_UNQUOTED(GLADE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}") + glade_data_dir="${ac_default_prefix}/share" else - AC_DEFINE_UNQUOTED(GLADE_DATA_DIR, "${prefix}/share/${PACKAGE}") + glade_data_dir="${prefix}/share" fi else - AC_DEFINE_UNQUOTED(GLADE_DATA_DIR, "${datadir}/${PACKAGE}") + glade_data_dir="${datadir}" fi +AC_DEFINE_UNQUOTED(GLADE_DATA_DIR, "${glade_data_dir}", [Data directory of Glade-3.]) +AC_DEFINE_UNQUOTED(ICONS_DIR, "${glade_data_dir}/pixmaps", [Icons directory of Glade-3.]) +AC_DEFINE_UNQUOTED(LOCALE_DIR, "${glade_data_dir}/locale", [Locale directory of Glade-3.]) dnl ================================================================ -dnl PIXMAPS +dnl PIXMAPS, WIDGETS, CATALOGS dnl ================================================================ if test "x${prefix}" = "xNONE"; then - AC_DEFINE_UNQUOTED(PIXMAPS_DIR, "${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}-${VERSION}/pixmaps") - pixmapsdir="${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}-${VERSION}/pixmaps" - AC_DEFINE_UNQUOTED(WIDGETS_DIR, "${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}-${VERSION}/widgets") - widgetsdir="${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}-${VERSION}/widgets" - AC_DEFINE_UNQUOTED(CATALOGS_DIR, "${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}-${VERSION}/catalogs") - catalogsdir="${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}-${VERSION}/catalogs" + tmp="${ac_default_prefix}" else - AC_DEFINE_UNQUOTED(PIXMAPS_DIR, "${prefix}/${DATADIRNAME}/${PACKAGE}-${VERSION}/pixmaps") - pixmapsdir="${prefix}/${DATADIRNAME}/${PACKAGE}-${VERSION}/pixmaps" - AC_DEFINE_UNQUOTED(WIDGETS_DIR, "${prefix}/${DATADIRNAME}/${PACKAGE}-${VERSION}/widgets") - widgetsdir="${prefix}/${DATADIRNAME}/${PACKAGE}-${VERSION}/widgets" - AC_DEFINE_UNQUOTED(CATALOGS_DIR, "${prefix}/${DATADIRNAME}/${PACKAGE}-${VERSION}/catalogs") - catalogsdir="${prefix}/${DATADIRNAME}/${PACKAGE}-${VERSION}/catalogs" + tmp="${prefix}" fi +pixmapsdir="${tmp}/${DATADIRNAME}/${PACKAGE}-${VERSION}/pixmaps" +widgetsdir="${tmp}/${DATADIRNAME}/${PACKAGE}-${VERSION}/widgets" +catalogsdir="${tmp}/${DATADIRNAME}/${PACKAGE}-${VERSION}/catalogs" +AC_DEFINE_UNQUOTED(PIXMAPS_DIR, "$pixmapsdir", [Pixmaps directory of Glade-3.]) +AC_DEFINE_UNQUOTED(WIDGETS_DIR, "$widgetsdir", [Widgets directory of Glade-3.]) +AC_DEFINE_UNQUOTED(CATALOGS_DIR, "$catalogsdir", [Catalogs directory of Glade-3.]) dnl ================================================================ dnl MODULES @@ -96,6 +94,14 @@ AC_SUBST(modulesdir) case $host_os in *mingw* | pw32* | cygwin*) win32=yes + AC_ARG_ENABLE(popt_dll, + [ --disable-popt-dll disable use of libpopt.dll (use static version instead)], + popt_dll=$enableval, popt_dll=yes) + if test "x$popt_dll" = "xyes"; then + AC_DEFINE(USE_POPT_DLL, 1, [Define to 1 if libpopt.dll is to be used.]) + else + AC_DEFINE(POPT_STATIC, 1, [Define to 1 if static version of libpopt is to be used.]) + fi ;; esac AM_CONDITIONAL(WITH_WIN32, test x"$win32" = "xyes") -- cgit v1.2.1