code cosmetics to the iterator fix

[lyx.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 0e22032ade05622610f07f934f3aedd5e0a1f5df..978babc5726585c70c237453d9c421c0b7982559 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,26 +1,31 @@
 dnl Process with autoconf to generate configure script   -*- sh -*-
 
-AC_INIT(lyx,1.4.0cvs,lyx-devel@lists.lyx.org)
+AC_INIT(LyX,1.4.0svn,[lyx-devel@lists.lyx.org],[lyx])
 AC_PREREQ(2.52)
 AC_CONFIG_SRCDIR(src/main.C)
-AM_CONFIG_HEADER([src/config.h])
+AC_CONFIG_HEADERS([src/config.h])
 
 AC_CONFIG_AUX_DIR(config)
 
-PACKAGE=lyx${program_suffix}
-VERSION="1.4.0cvs"
+# First check the version
 LYX_CHECK_VERSION
+LYX_VERSION_SUFFIX
+# Check how the files should be packaged
+AC_CANONICAL_TARGET
+LYX_USE_PACKAGING
+# We need to define these variables here and the no-define option of
+# AM_INIT_AUTOMAKE above because we alter $PACKAGE in LYX_USE_PACKAGING. 
+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
 
 dnl default maintainer mode to true for development versions
 if test "${enable_maintainer_mode+set}" != set; then
   enable_maintainer_mode=$lyx_devel_version
 fi
 AM_MAINTAINER_MODE
-AC_CANONICAL_TARGET
-
-LYX_VERSION_SUFFIX
 
-AM_INIT_AUTOMAKE($lyxname, $VERSION)
+save_PACKAGE=$PACKAGE
+AM_INIT_AUTOMAKE([foreign dist-bzip2 tar-ustar no-define 1.9])
+PACKAGE=$save_PACKAGE
 
 ### Set the execute permissions of the various scripts correctly
 for file in config/install-sh config/mkinstalldirs lib/configure ; do
@@ -156,21 +161,13 @@ esac
 
 ### check which frontend we want to use
 
-dnl if the gtk frontend has been specified, then xforms is needed too
-if echo $FRONTENDS | grep gtk | grep -v xforms ; then
-  FRONTENDS="xforms $FRONTENDS"
-  noxformsbin=yes
-fi
-
 dnl The code below is not in a macro, because this would cause big
 dnl problems with the AC_REQUIRE contained in QT_DO_IT_ALL.
 for frontend in $FRONTENDS ; do
   case "$frontend" in
     xforms)
          XFORMS_DO_IT_ALL
-         if test -z "$noxformsbin" ; then
-           FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-xforms\$(EXEEXT)"
-         fi
+         FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-xforms\$(EXEEXT)"
          FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS xforms"
          RPM_FRONTEND="xforms"
          FRONTEND_INFO="${FRONTEND_INFO}\
@@ -178,20 +175,8 @@ for frontend in $FRONTENDS ; do
       libXpm version:\t\t${XPM_VERSION}\n\
       libforms version:\t\t${XFORMS_VERSION}\n"
          ;;
-  dnl   gnome)
-  dnl     XFORMS_DO_IT_ALL
-  dnl     PKG_CHECK_MODULES(GNOME_FRONTEND, gtkmm-2.0 libglademm-2.0)
-  dnl     AC_SUBST(GNOME_FRONTEND_CFLAGS)
-  dnl     AC_SUBST(GNOME_FRONTEND_LIBS)
-
-  dnl     FRONTEND="xforms gnome"
-  dnl     FRONTEND_GUILIB="gnome/*.lo"
-  dnl     FRONTEND_LDFLAGS="${GNOME_FRONTEND_LIBS}"
-  dnl     FRONTEND_INCLUDES="${GNOME_FRONTEND_CFLAGS}"
-  dnl     FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ ${GNOME_FRONTEND_LIBS}"
-  dnl  ;;
     gtk)
-         PKG_CHECK_MODULES(GTK_FRONTEND, gtkmm-2.4 libglademm-2.4)
+         PKG_CHECK_MODULES(GTK_FRONTEND, gtkmm-2.4 libglademm-2.4 xft)
          FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-gtk\$(EXEEXT)"
          FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS gtk"
          RPM_FRONTEND="gtk"
@@ -227,8 +212,6 @@ dnl qt build will fail without moc or uic
   esac
 done
 
-### Check how the files should be packaged
-LYX_USE_PACKAGING
 # fix the value of the prefixes.
 test "x$prefix" = xNONE && prefix=$default_prefix
 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -302,7 +285,17 @@ LYX_CHECK_SPELL_ENGINES
 
 lyx_client_subdir=true
 AC_LANG_PUSH(C)
-AC_CHECK_FUNCS(fcntl,, [lyx_client_subdir=false])
+dnl LIBS already contains some X extra libs that may interfere.
+save_LIBS="$LIBS"
+LIBS=
+AC_CHECK_FUNCS(fcntl,
+  [AC_SEARCH_LIBS([gethostbyname], [nsl])
+   AC_SEARCH_LIBS([socket], [socket], [], 
+     [AC_CHECK_LIB([socket], [socket], [LIBS="-lsocket -lnsl $LIBS"],
+                [], [-lnsl])])], 
+  [lyx_client_subdir=false])
+AC_SUBST(SOCKET_LIBS,$LIBS)
+LIBS="$save_LIBS"
 AM_CONDITIONAL(BUILD_CLIENT_SUBDIR, $lyx_client_subdir)
 AC_LANG_POP(C)
 
@@ -310,7 +303,8 @@ AC_FUNC_SELECT_ARGTYPES
 
 ### Some information on what just happened
 real_bindir=`eval "echo \`eval \"echo ${bindir}\"\`"`
-real_datadir=`eval "echo \`eval \"echo ${datadir}/${PACKAGE}\"\`"`
+real_pkgdatadir=`eval "echo \`eval \"echo ${pkgdatadir}\"\`"`
+real_localedir=`eval "echo \`eval \"echo ${datadir}/locale\"\`"`
 VERSION_INFO="Configuration\n\
   Host type:                      ${host}\n\
   Special build flags:            ${lyx_flags}\n\
@@ -325,12 +319,11 @@ VERSION_INFO="Configuration\n\
 ${FRONTEND_INFO}\
   Packaging:                      ${lyx_use_packaging}\n\
   LyX binary dir:                 ${real_bindir}\n\
-  LyX files dir:                  ${real_datadir}\n"
+  LyX files dir:                  ${real_pkgdatadir}\n"
 
-real_localedir=`eval "echo \`eval \"echo ${datadir}/locale\"\`"`
 MSYS_AC_CANONICAL_PATH(LYX_ABS_TOP_SRCDIR, ${srcdir})
 MSYS_AC_CANONICAL_PATH(LYX_ABS_INSTALLED_LOCALEDIR, ${real_localedir})
-MSYS_AC_CANONICAL_PATH(LYX_ABS_INSTALLED_DATADIR, ${real_datadir})
+MSYS_AC_CANONICAL_PATH(LYX_ABS_INSTALLED_DATADIR, ${real_pkgdatadir})
 
 AC_SUBST(VERSION_INFO)
 AC_SUBST(RPM_FRONTEND)